[mb-commits] branch, beta, updated. Merge remote-tracking branch 'bitmap/mbs-5577' into beta MBS-5577: Relationsh...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=75a272c90f7dce4b5b76957615094e21efc55e66 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=665d7bdcffc8b81a73423280b2b9b9ead217001b (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=c6fe5b67447dc01fcd0c5b8a69f1d107ded67355 (commit)

Summary of changes:
 .../scripts/relationship-editor/Relationship.js    |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 75a272c90f7dce4b5b76957615094e21efc55e66
Merge: c6fe5b6 665d7bd
Author: Oliver Charles <[email protected]>
Date:   Thu Jan 3 12:17:54 2013 +0000

    Merge remote-tracking branch 'bitmap/mbs-5577' into beta
    
    * bitmap/mbs-5577:
      MBS-5577: Relationship Editor displays "vocal vocals"


commit 665d7bdcffc8b81a73423280b2b9b9ead217001b
Author: Michael Wiencek <[email protected]>
Date:   Wed Dec 19 15:41:00 2012 +0000

    MBS-5577: Relationship Editor displays "vocal vocals"

diff --git a/root/static/scripts/relationship-editor/Relationship.js b/root/static/scripts/relationship-editor/Relationship.js
index 1b37fea..388c8de 100644
--- a/root/static/scripts/relationship-editor/Relationship.js
+++ b/root/static/scripts/relationship-editor/Relationship.js
@@ -191,12 +191,13 @@ Relationship.prototype.linkPhrase = function(source) {
     _.each(this.attrs(), function(observable, name) {
         var value = observable();
 
-        if (_.isArray(value) && value.length) {
-            value = _.map(value, function(v) {return Util.attrInfo(v).l_name});
-
-            var list = value.slice(0, -1).join(", ");
-            attrs[name] = (list && list + " & ") + (value.pop() || "");
+        if (_.isArray(value)) {
+            if (value.length) {
+                value = _.map(value, function(v) {return Util.attrInfo(v).l_name});
 
+                var list = value.slice(0, -1).join(", ");
+                attrs[name] = (list && list + " & ") + (value.pop() || "");
+            }
         } else if (value) attrs[name] = Util.attrRoot(name).l_name;
     });
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
mb_server