fix: cache

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

diff --git a/app/assets/javascripts/controllers.js.coffee b/app/assets/javascripts/controllers.js.coffee
index 76c542f..08f3925 100644 (file)
--- a/app/assets/javascripts/controllers.js.coffee
+++ b/app/assets/javascripts/controllers.js.coffee
@@ -1,11 +1,14 @@
 class Pettanr.AppController\r
   \r
-  constructor: (@params, @form, @operators, @gate) ->\r
+  constructor: (@params, @form, @gate) ->\r
     _.extend(this, Backbone.Events)\r
   \r
-  @new2: (params, form, operators, gate) ->\r
-    c = Pettanr[Pettanr.camelize(params['controller']) + 'Controller']\r
-    new c(params, form, operators, gate)\r
+  @new2: (params, form, gate) ->\r
+    c = @controller_by_name(params['controller'])\r
+    new c(params, form, gate)\r
+  \r
+  @controller_by_name: (name) ->\r
+    Pettanr[Pettanr.camelize(name) + 'Controller']\r
   \r
   set_model: () ->\r
     @my_controller = Manifest.manifest().controllers[@params['controller']]\r
@@ -18,38 +21,26 @@ class Pettanr.AppController
     @my_list_model = Manifest.manifest().models[@my_action.item_name]\r
     @my_list_model_class = @my_list_model.classify()\r
     @list = Locmare.ListGroup.list(\r
-      @my_action.path_name(), @my_action.name, @operators, @params\r
+      @my_action.path_name(), @my_action.name, @params\r
     )\r
   \r
   set_show: (render_func) ->\r
     @set_model()\r
-    @empty_item = new @my_model_class({id: @params['id']})\r
-    @item = Pettanr.cache.restore(@empty_item)\r
-    if @item\r
-      # got cached item\r
-      render_func.call(this)\r
-    else\r
-      # built empty item\r
-      @item = @empty_item\r
-      @item.fetch().done =>\r
-        Pettanr.cache.store(@item)\r
-        render_func.call(this)\r
+    retriever = new Pettanr.Cache.Retriever(@my_model_class, @params['id'])\r
+    @listenTo(retriever, 'retrieve', render_func)\r
+    retriever.retrieve()\r
   \r
   filer_list: () ->\r
     @set_list()\r
     @list.open(() =>\r
       pager = Locmare.ListGroupModule.LibModule.Pager.factory(@list.page_status, @params)\r
-      filer_class = if @params['format'] == 'pick'\r
-        Locmare.Picker\r
-      else\r
-        Locmare.Filer\r
-      filer = new filer_class({\r
+      filer = new Locmare.Filer({\r
         item_name: @list.item_name, \r
         items: @list.items(), \r
-        pager: pager, \r
-        operators: @operators\r
+        pager: pager\r
       })\r
       @listenTo(filer, 'navigate', @navigate)\r
+      filer.render()\r
       @trigger('ready', filer)\r
     )\r
     false\r
@@ -60,24 +51,15 @@ class Pettanr.AppController
     @binder_controller = @binder_action.controller()\r
     @binder_model = Manifest.manifest().models[@binder_action.item_name]\r
     @binder_model_class = @binder_model.classify()\r
-    @empty_item = new @binder_model_class({id: @params['id']})\r
-    @item = Pettanr.cache.restore(@empty_item)\r
-    if @item\r
-      # got cached item\r
-      render_func.call(this)\r
-    else\r
-      # built empty item\r
-      @item = @empty_item\r
-      @item.fetch().done =>\r
-        Pettanr.cache.store(@item)\r
-        render_func.call(this)\r
+    retriever = new Pettanr.Cache.Retriever(@binder_model_class, @params['id'])\r
+    @listenTo(retriever, 'retrieve', render_func)\r
+    retriever.retrieve()\r
   \r
   show_prof: () ->\r
     @item.boosts 'post'\r
     profiler = new Locmare.Profiler({\r
       item_name: @item.item_name(), \r
-      item: @item, \r
-      operators: @operators\r
+      item: @item\r
     })\r
     @listenTo(profiler, 'navigate', @navigate)\r
     profiler.render()\r
@@ -88,25 +70,16 @@ class Pettanr.AppController
   set_new: () ->\r
     @set_model()\r
     @item = new @my_model_class({id: @params['id']})\r
-    @item.boosts 'post'\r
     # Backbone.Model has defaults property\r
     #@item.supply_default()\r
   \r
-  set_edit: () ->\r
+  set_edit: (options = {}) ->\r
     @set_model()\r
-    @empty_item = new @my_model_class({id: @params['id']})\r
-    @item = Pettanr.cache.restore(@empty_item)\r
-    if @item\r
-      # got cached item\r
-      @render_edit()\r
-    else\r
-      # built empty item\r
-      @item = @empty_item\r
-      Pettanr.cache.store(@empty_item)\r
-      @item.fetch().done =>\r
-        @render_edit()\r
-  \r
-  render_edit: () ->\r
+    retriever = new Pettanr.Cache.Retriever(@my_model_class, @params['id'])\r
+    @listenTo(retriever, 'retrieve', @render_edit)\r
+    retriever.edit(options)\r
+  \r
+  render_edit: (@item) ->\r
     @item.boosts 'post'\r
     @render_form()\r
   \r
@@ -116,20 +89,17 @@ class Pettanr.AppController
       use_name: 'default', \r
       item: @item, \r
       element_form: false, \r
-      submit: 'default', \r
-      operators: @operators,\r
+      submit: 'default'\r
     })\r
     @form.render()\r
     @trigger('ready', @form)\r
     @trigger('lock', @params, @form)\r
   \r
   form_new: () ->\r
-    # how cansel on picker edit button?\r
     @set_new()\r
     @render_form()\r
   \r
   form_edit: () ->\r
-    # how cansel on picker edit button?\r
     @set_edit()\r
   \r
   post_success: (model, response) ->\r