[mb-commits] branch, beta, updated. Merge branch 'beta' of ssh://git.musicbrainz.org:10015/ musicbrainz-server int...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=7e3ee2b2874ef2c62bea859e3859bfc619163739 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=3a54fd04c830ced2dede55263cbac52db1bc2a49 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=5c34d20b9077c1752179e1b4a9491ecbc6154cd8 (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=ea9bdb2ecb11953a9f848187860a658f1f6f1eb6 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=2a2e95eb81f7c841d406ed91e66ddd9c67fabbe4 (commit)

Summary of changes:
 root/release/edit_relationships.tt                 |    4 +++-
 .../relationship-editor/RelationshipEditor.js      |   12 +++++++-----
 2 files changed, 10 insertions(+), 6 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 7e3ee2b2874ef2c62bea859e3859bfc619163739
Merge: 3a54fd0 2a2e95e
Author: Oliver Charles <[email protected]>
Date:   Mon Feb 4 09:52:37 2013 +0000

    Merge branch 'beta' of ssh://git.musicbrainz.org:10015/musicbrainz-server into beta
    
    * 'beta' of ssh://git.musicbrainz.org:10015/musicbrainz-server:
      Update .pot file.
      Clarify why seed-love-bug still exists even though the selenium tests which previously used it have been removed.
      MBS-1774: update tests
      MBS-1774: add type-id attribute and key to webservice results for relations
      MBS-5757: reduce open time for all edits to 7 days
      MBS-5742: clean up chained subtraction/addition, and last_item setting
      MBS-5617: tweak styling to remove explicit linebreaks, since I don't want to argue further
      MBS-5742: use form.field.value.size instead of an explicit counter
      Remove selenium tests.
      MBS-5742: require JS on ISWCs/IPIs only for interactive use
      MBS-5617: remove newimagegoeshere-125.png, replace with div/p and a translatable string


commit 3a54fd04c830ced2dede55263cbac52db1bc2a49
Merge: 5c34d20 ea9bdb2
Author: Oliver Charles <[email protected]>
Date:   Sun Feb 3 23:19:57 2013 +0000

    Merge remote-tracking branch 'bitmap/mbs-5719' into beta
    
    * bitmap/mbs-5719:
      MBS-5719: Track number sometimes missing in rel editor


commit 5c34d20b9077c1752179e1b4a9491ecbc6154cd8
Author: Michael Wiencek <[email protected]>
Date:   Sun Feb 3 17:44:34 2013 +0000

    MBS-5727: Disc [medium] title missing from edit relationships page

diff --git a/root/release/edit_relationships.tt b/root/release/edit_relationships.tt
index 0635c23..07c3ee9 100644
--- a/root/release/edit_relationships.tt
+++ b/root/release/edit_relationships.tt
@@ -379,7 +379,9 @@
             <td></td>
             <td colspan="2">
               <input type="checkbox" class="medium-recordings">
-              <!-- ko text: format --><!-- /ko -->
+              <!-- ko text: format --><!-- /ko --><!-- ko if: name -->:
+                <!-- ko text: name --><!-- /ko -->
+              <!-- /ko -->
             </td>
             <td><input type="checkbox" class="medium-works"></td>
           </tr>

commit ea9bdb2ecb11953a9f848187860a658f1f6f1eb6
Author: Michael Wiencek <[email protected]>
Date:   Sun Feb 3 17:18:16 2013 +0000

    MBS-5719: Track number sometimes missing in rel editor
    
    If a relationship whose target is a recording that's also part of the
    tracklist is parsed before the recording node for the actual tracklist
    is parsed, then the recording Entity will be missing its number
    attribute, among other things.

diff --git a/root/static/scripts/relationship-editor/RelationshipEditor.js b/root/static/scripts/relationship-editor/RelationshipEditor.js
index bc3daf3..1975166 100644
--- a/root/static/scripts/relationship-editor/RelationshipEditor.js
+++ b/root/static/scripts/relationship-editor/RelationshipEditor.js
@@ -216,15 +216,17 @@ parseTrack = function(track, release) {
     var recording = track.recording;
     recording.type = "recording";
     recording.name = track.name;
-    recording.position = track.position;
-    recording.number = track.number;
     delete recording.artist_credit;
-    recording.artistCredit = "";
+
+    var entity = RE.Entity(recording);
+    entity.position = track.position;
+    entity.number = track.number;
+    entity.artistCredit = "";
 
     if (!Util.compareArtistCredits(release.artist_credit, track.artist_credit))
-        recording.artistCredit = UI.renderArtistCredit(track.artist_credit);
+        entity.artistCredit = UI.renderArtistCredit(track.artist_credit);
 
-    return RE.Entity(recording);
+    return entity;
 };
 
 

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


hooks/post-receive
-- 
mb_server