t#:

[pettanr/pettanr.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 4c64f53..2d4d0d9 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -117,9 +117,7 @@ class ApplicationController < ActionController::Base
   
   def set_list
     set_model
-    @my_model_list = @my_model.lists[@my_action.list_name]
-    @my_list = Manifest.manifest.lists[@my_action.item_name]
-    @list = @my_list[@my_action.list_name]
+    @list = Manifest::View::ListGroup.list @my_action.item_name, @my_action.list_name
   end
   
   def filer_list
@@ -133,12 +131,31 @@ class ApplicationController < ActionController::Base
           :filer => @filer
         }
       }
-      format.json { render json: @items.to_json(self.class.model.list_json_opt) }
+      format.json { render json: @items.to_json(@my_model_class.list_json_opt) }
       format.atom 
       format.rss
     end
   end
   
+  def set_show
+    set_model
+    @item = @my_model_class.show(params[:id], @operators)
+  end
+  
+ def show_prof_format format
+    format.prof {
+      self.formats = [:html]
+      @profiler = Manifest::View::Profiler.new @my_model.model_name, @item, @operators
+      render @profiler.template_name, :locals => {
+        :profiler => @profiler
+      }
+    }
+  end
+  
+  def show_json_format format
+    format.json { render json: @item.to_json(@my_model_class.show_json_opt) }
+  end
+  
   def set_new
     set_model
     @item = @my_model_class.new
@@ -200,12 +217,13 @@ class ApplicationController < ActionController::Base
   end
   
   def assist_items item_name, list_name
-    list_manager = Pettanr::Application::manifest.list_managers[item_name]
-    list = list_manager.open list_name, 1, 5, @operators
-    list.items
+    list = Manifest.manifest.list_groups[item_name].lists[list_name]
+    list_result = list.open(@operators, {:id => @item.id, :page => 1, :page_size => 5})
+    list_result.items
   end
   
   def assist_filer item_name, items
+    @filer = Manifest::View::Filer.new @list.item_name, list_result.items, list_result.paginate, @operators
     filer_manager = Pettanr::Application::manifest.filer_managers[item_name]
     filer_manager.open(item_name, items, @operators, nil)
   end