fix filer

[pettanr/pettanr.git] / app / assets / javascripts / pettanr.js.coffee

diff --git a/app/assets/javascripts/pettanr.js.coffee b/app/assets/javascripts/pettanr.js.coffee
index e2bdc23..1de7dd2 100644 (file)
--- a/app/assets/javascripts/pettanr.js.coffee
+++ b/app/assets/javascripts/pettanr.js.coffee
@@ -1,4 +1,6 @@
 class Pettanr\r
+  # Foo.class -> Pettanr[@constructor.name]\r
+\r
   @is_blank: (str) ->\r
     !str?.trim()\r
   \r
@@ -39,8 +41,11 @@ class Pettanr
         if l.length == 1\r
           I18n.t('activerecord.models.' + Pettanr[label].item_name())\r
         else\r
-          I18n.t('activerecord.models.attribtes.' + Pettanr[l.first].item_name() + '.' + l.last)\r
+          Pettanr.AppHelper.t_a(Pettanr[l.first].item_name(), l.last)\r
     \r
+    @t_a: (item_name, attr_name) ->\r
+      I18n.t('activerecord.attributes.' + item_name + '.' + attr_name)\r
+      \r
     @t_select_items: (items) ->\r
       _.map items, (i) ->\r
         [t(i[0]), i[1]]\r
@@ -111,53 +116,27 @@ class Pettanr
     count: () ->\r
       @get('count')\r
     \r
-  class Pettanr.Url\r
+  class Pettanr.Pager extends Backbone.View\r
     \r
-    @decode: (params) ->\r
-      \r
-    @encode: (params) ->\r
-      \r
-  class Pettanr.Pager\r
-    \r
-    initialize: (@counter) ->\r
-      @counter.fetch().done ->\r
-        \r
-      @current_page = @list_result.page\r
-      @per_page = @list_result.page_size\r
-      @total_page = (@total / @per_page) + 1\r
+    initialize: (options) ->\r
+      @action = options['action']\r
+      @params = options['params']\r
+      @current_page = @params['page']\r
+      @per_page = @params['page_size']\r
       @window_size = 3\r
-    \r
-    @by_params: (params) ->\r
-      \r
-      @page = params['page']\r
-      @page_size = params['page_size']\r
-      @counter = new Pettanr.CounterModel({}, {url: '/' + params['controller'] + i + 'count_' + a})\r
-      new Pettanr.Pager()\r
+      @counter = new Pettanr.CounterModel({}, {url: '/' + @action.counter_url(@params)})\r
+      _this = this\r
+      @counter.fetch().done ->\r
+        _this.total_page = (@total / _this.per_page) + 1\r
   \r
   class Pettanr.FilerCollection extends Backbone.Collection\r
     \r
     initialize: (models, options) ->\r
       @model = options['model']\r
-      params = options['params']\r
-      @counter = options['counter']\r
+      @action = options['action']\r
+      @params = options['params']\r
       \r
-      i = if params['id']\r
-        params['id'] + '/'\r
-      else\r
-        ''\r
-      a = if params['action'] != 'index'\r
-        params['action']\r
-      else\r
-        ''\r
-      q = []\r
-      q.push('page=' + Pettanr.to_s(@page)) if @page\r
-      q.push('page_size=' + Pettanr.to_s(@page_size)) if @page_size\r
-      qry = if q.length > 0\r
-        '?' + q.join('&')\r
-      else\r
-        ''\r
-      @url = '/' + params['controller'] + i + a + qry\r
-      @pager = new Pettanr.Pager(@counter)\r
+      @url = '/' + @action.url(@params)\r
   \r
   class Pettanr.AppController\r
     constructor: () ->\r
@@ -173,16 +152,16 @@ class Pettanr
       @set_model()\r
       @my_list_model = Manifest.manifest().models[@my_action.item_name]\r
       @my_list_model_class = @my_list_model.classify()\r
-      @counter = new Pettanr.CounterModel({}, {url: @my_action.url(i)})\r
-      @list = new Pettanr.FilerCollection({}, {model: @my_list_model_class, counter: @counter, params: @params})\r
+      @pager = new Pettanr.Pager({action: @my_action, params: @params})\r
+      @list = new Pettanr.FilerCollection({}, {model: @my_list_model_class, action: @my_action, params: @params})\r
     \r
     filer_list: () ->\r
       @set_list()\r
       f = new Locmare.Filer({\r
         el: "#pettanr",\r
         item_name: @my_list_model_class.item_name(), \r
-        list: @list, \r
-        pager: @list.pager, \r
+        collection: @list, \r
+        pager: @pager, \r
         operators: window.operators\r
       })\r
   \r