[mb-commits] r12611 - mb_server/trunk/root/artist

[root at musicbrainz.org]

Author: acid2
Date: 2010-01-22 22:57:59 +0000 (Fri, 22 Jan 2010)
New Revision: 12611

Modified:
   mb_server/trunk/root/artist/merge_confirm.tt
Log:
Few fixes to merging artists.

* Correctly display the edit template.
* Correctly display old/new artist in merge confirmation

Modified: mb_server/trunk/root/artist/merge_confirm.tt
===================================================================
--- mb_server/trunk/root/artist/merge_confirm.tt	2010-01-22 22:57:51 UTC (rev 12610)
+++ mb_server/trunk/root/artist/merge_confirm.tt	2010-01-22 22:57:59 UTC (rev 12611)
@@ -1,7 +1,7 @@
 [% WRAPPER 'artist/layout.tt' title=l('Merge Artists') %]
     <h2>[% l('Merge Artists') %]</h2>
     [% WRAPPER 'layout/guidelines.tt' %]
-        [%- create_guideline(l('Are you sure that you want to merge the artist {artist1} into the artist {artist2}?', {artist1 => link_artist(old_artist), artist2 => link_artist(new_artist)})) -%]
+        [%- create_guideline(l('Are you sure that you want to merge the artist {artist1} into the artist {artist2}?', {artist1 => link_artist(old), artist2 => link_artist(new)})) -%]
     [%- END -%]
     <form action="[% c.req.uri_with( gid => new_artist.gid ) %]" method="post">
         [% INCLUDE "forms/edit-note.tt" %]