merge

[pettanr/pettanr.git] / app / assets / javascripts / views / artists / show.js.coffee

diff --git a/app/assets/javascripts/views/artists/show.js.coffee b/app/assets/javascripts/views/artists/show.js.coffee
index cb75eb1..00561e1 100644 (file)
--- a/app/assets/javascripts/views/artists/show.js.coffee
+++ b/app/assets/javascripts/views/artists/show.js.coffee
@@ -4,7 +4,7 @@ class Pettanr.Views.Artist.ShowModule.Header extends Pettanr.Views.Show.Header
   initialize: (options) ->\r
     super(options)\r
   \r
-class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Backbone.View\r
+class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Pettanr.View\r
   \r
   initialize: (options) ->\r
     super(options)\r
@@ -15,25 +15,21 @@ class Pettanr.Views.Artist.ShowModule.ResourcePictures extends Backbone.View
       controller: 'resource_pictures', action: 'by_artist', id: @item.get('id'),\r
       page_size: 5\r
     }\r
-    @list = Locmare.ListGroup.list(\r
-      params['controller'], params['action'], params\r
-    )\r
-    @list.open(() =>\r
-      pager = Locmare.ListGroupModule.LibModule.Pager.factory(@list.page_status, params)\r
-      filer = new Locmare.Filer({\r
-        item_name: @list.item_name, \r
-        items: @list.items(), \r
-        pager: pager\r
-      })\r
-      @listenTo(filer, 'http_get', @http_get)\r
-      this.$el.append(filer.render().el)\r
-    )\r
+    controller = Manifest.manifest().controllers[params['controller']]\r
+    action = controller.actions[params['action']]\r
+    @list = action.find(params)\r
+    @list.to_filer(this, {\r
+      success: (filer) => \r
+        pager = Locmare.ListGroupModule.LibModule.Pager.factory(@list.page_status, params)\r
+        @listenTo(filer, 'http_get', @http_get)\r
+        this.$el.append(filer.render().el)\r
+    })\r
     this\r
   \r
   http_get: (url) ->\r
     @trigger('http_get', url)\r
   \r
-class Pettanr.Views.Artist.ShowModule.Body extends Backbone.View\r
+class Pettanr.Views.Artist.ShowModule.Body extends Pettanr.View\r
   \r
   initialize: (options) ->\r
     super(options)\r
@@ -49,7 +45,7 @@ class Pettanr.Views.Artist.ShowModule.Body extends Backbone.View
   http_get: (url) ->\r
     @trigger('http_get', url)\r
   \r
-class Pettanr.Views.Artist.Show extends Backbone.View\r
+class Pettanr.Views.Artist.Show extends Pettanr.View\r
   tagName: 'div'\r
   \r
   initialize: (options) ->\r