r10401 - in mb_server/branches/TemplateToolkit: lib/MusicBrainz/Server/Model root/artist root/components root/label

[root-97]

Author: acid2
Date: 2008-09-30 14:41:19 +0000 (Tue, 30 Sep 2008)
New Revision: 10401

Added:
   mb_server/branches/TemplateToolkit/root/components/search.tt
Modified:
   mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Artist.pm
   mb_server/branches/TemplateToolkit/root/artist/merge_search.tt
   mb_server/branches/TemplateToolkit/root/label/merge_search.tt
Log:
Refactored the mini search system into easy to include templates

Modified: mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Artist.pm
===================================================================
--- mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Artist.pm 2008-09-30 14:40:59 UTC (rev 10400)
+++ mb_server/branches/TemplateToolkit/lib/MusicBrainz/Server/Model/Artist.pm 2008-09-30 14:41:19 UTC (rev 10401)
@@ -60,6 +60,7 @@
     {
         my $artist = new MusicBrainz::Server::Artist($self->context->mb->{DBH});
         $artist->id($row->{artistid});
+        $artist->mbid($row->{artistgid});
         $artist->name($row->{artistname});
         $artist->sort_name($row->{artistsortname});
         $artist->resolution($row->{artistresolution});

Modified: mb_server/branches/TemplateToolkit/root/artist/merge_search.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/artist/merge_search.tt 2008-09-30 14:40:59 UTC (rev 10400)
+++ mb_server/branches/TemplateToolkit/root/artist/merge_search.tt 2008-09-30 14:41:19 UTC (rev 10401)
@@ -25,18 +25,8 @@
   </li>
 </ul>
 
-[%- WRAPPER "forms/form.tt" -%]
-  [%- INCLUDE "forms/widget.tt" widget=form.field('query') label="Artist" -%]
-  [%- INCLUDE "forms/submit.tt" label="Search" %]
-[%- END -%]
+[%- BLOCK create_link; entity_url(artist, 'merge_into', entity.mbid); END -%]
+[%- INCLUDE "components/search.tt" entities=artists search_label="Artist" -%]
 
-[%- IF artists.size -%]
-  <ul>
-  [%- FOREACH search_artist=artists -%]
-    <li><a href="[% entity_url(artist, 'merge_into', search_artist.mbid) %]">[% search_artist.name %]</a></li>
-  [%- END -%]
-  </ul>
-[%- END -%]
-
 [% END %]
 [% END %]

Added: mb_server/branches/TemplateToolkit/root/components/search.tt

Modified: mb_server/branches/TemplateToolkit/root/label/merge_search.tt
===================================================================
--- mb_server/branches/TemplateToolkit/root/label/merge_search.tt 2008-09-30 14:40:59 UTC (rev 10400)
+++ mb_server/branches/TemplateToolkit/root/label/merge_search.tt 2008-09-30 14:41:19 UTC (rev 10401)
@@ -25,18 +25,8 @@
   </li>
 </ul>
 
-[%- WRAPPER "forms/form.tt" -%]
-  [%- INCLUDE "forms/widget.tt" widget=form.field('query') label="Label" -%]
-  [%- INCLUDE "forms/submit.tt" label="Search" %]
-[%- END -%]
+[%- BLOCK create_link; entity_url(label, 'merge_into', entity.mbid); END -%]
+[%- INCLUDE "components/search.tt" entities=labels search_label="Label" -%]
 
-[%- IF labels.size -%]
-  <ul>
-  [%- FOREACH search_label=labels -%]
-    <li><a href="[% entity_url(label, 'merge_into', search_label.mbid) %]">[% search_label.name %]</a></li>
-  [%- END -%]
-  </ul>
-[%- END -%]
-
 [% END %]
 [% END %]


_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits