[mb-commits] branch, mbs-5610, created. MBS-5610, always display "Set cover art" link, remove "Remove release group " ...

The branch, mbs-5610 has been created
        at  e1f732d0a6030102f0e2d9c2b2ff51e1561be7bc (commit)

- Log -----------------------------------------------------------------
commit e1f732d0a6030102f0e2d9c2b2ff51e1561be7bc
Author: warp <[email protected]>
Date:   Thu Nov 29 11:56:14 2012 +0100

    MBS-5610, always display "Set cover art" link, remove "Remove release group" link.

diff --git a/root/release_group/layout.tt b/root/release_group/layout.tt
index 19c694e..5f2d46a 100644
--- a/root/release_group/layout.tt
+++ b/root/release_group/layout.tt
@@ -44,17 +44,11 @@
                     [% l('Merge release group') %]
                   </a>
                 </li>
-                [%- IF rg.can_set_cover_art -%]
                 <li>
                   <a href="[% c.uri_for_action('/release_group/set_cover_art', [ rg.gid ]) %]">
                     [% l('Set cover art') %]
                   </a>
                 </li>
-                [%- END -%]
-
-                [%- IF can_delete -%]
-                    <li>[% link_entity(rg, 'delete', l('Remove release group')) %]</li>
-                [%- END -%]
 
                 <hr/>
 

commit a240caf306a75c3a2aec521a0da7c5de7f39f8ca
Author: warp <[email protected]>
Date:   Thu Nov 29 10:10:34 2012 +0100

    MBS-5610, Move "Set cover art" link to the correct section.

diff --git a/root/release_group/layout.tt b/root/release_group/layout.tt
index 1ff2064..19c694e 100644
--- a/root/release_group/layout.tt
+++ b/root/release_group/layout.tt
@@ -36,14 +36,6 @@
                     [% l('Add release') %]
                   </a>
                 </li>
-                [%- IF rg.can_set_cover_art -%]
-                <li>
-                  <a href="[% c.uri_for_action('/release_group/set_cover_art', [ rg.gid ]) %]">
-                    [% l('Set cover art') %]
-                  </a>
-                </li>
-                [%- END -%]
-
                 <hr/>
 
                 [% annotation_links(rg) %]
@@ -52,9 +44,17 @@
                     [% l('Merge release group') %]
                   </a>
                 </li>
-                [% IF can_delete %]
+                [%- IF rg.can_set_cover_art -%]
+                <li>
+                  <a href="[% c.uri_for_action('/release_group/set_cover_art', [ rg.gid ]) %]">
+                    [% l('Set cover art') %]
+                  </a>
+                </li>
+                [%- END -%]
+
+                [%- IF can_delete -%]
                     <li>[% link_entity(rg, 'delete', l('Remove release group')) %]</li>
-                [% END %]
+                [%- END -%]
 
                 <hr/>
 

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


hooks/post-receive
-- 
mb_server