fix profiler extend system

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2902206..55f54d1 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,6 +1,6 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  layout :devise_layout if MagicNumber['test_layout']
+  layout :devise_layout
   before_filter :bf
   
   def devise_layout
@@ -70,6 +70,10 @@ class ApplicationController < ActionController::Base
     authenticate_user! unless @operators.resource_reader?
   end
   
+  def authenticate_admin
+    authenticate_admin! unless @operators.admin?
+  end
+  
   def authenticate_author
     if @operators.author
       true
@@ -101,45 +105,99 @@ class ApplicationController < ActionController::Base
   end
   
   def self.controller
-    Pettanr::Application::manifest.controller_managers[self.model.item_name]
+    Manifest.manifest.controllers[self.model.item_name]
   end
   
   def self.profiler_manager
-    Pettanr::Application::manifest.profiler_managers[self.model.item_name]
+    Manifest.manifest.profiler_managers[self.model.item_name]
+  end
+  
+  def set_model
+    @my_controller = Manifest.manifest.controllers[params[:controller].to_s]
+    @my_action = @my_controller.actions[params[:action].to_s]
+    @my_model = Manifest.manifest.models[@my_action.item_name]
+    @my_model_class = @my_model.classify
   end
   
-  def public_list
-    action_name = params[:action]
-    @action = self.class.controller.open(action_name, params, @operators)
-    @items = @action.items 
+  def set_list
+    set_model
+    @list = Locmare::ListGroup.list @my_action.item_name, @my_action.list_name
+  end
+  
+  def filer_list
+    set_list
+    list_result = @list.open(@operators, {:id => params[:id]})
+    @items = list_result.items 
     respond_to do |format|
       format.html {
-        @filer = @action.filer
-        render :template => 'system/filer', :locals => {
+        @filer = Locmare::Filer.new @list.item_name, list_result.items, list_result.paginate, @operators
+        render @filer.template_name, :locals => {
           :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 my_list params
-    controller_name = params[:controller]
-    action_name = params[:action]
-    controller = Pettanr::Application::manifest.controller_managers[controller_name]
-    @action = controller.open(action_name, params, @operators)
-    @items = @action.items 
-
+  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 = Locmare::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
+    @item.supply_default
+  end
+  
+  def set_edit
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+  end
+  
+  def render_form
     respond_to do |format|
-      format.html {
-        @filer = @action.filer
-        render :template => 'system/filer', :locals => {
-          :filer => @filer
+      format.html { 
+        @form = Locmare::Form.new @item.item_name, @item, true, true, @operators
+        render @form.template_name, :locals => {
+          :form => @form
         }
       }
-      format.json { render json: @items.to_json(Scroll.list_json_opt) }
+      format.json { render json: @item.to_json(@my_model_class.show_json_opt) }
+    end
+  end
+  
+  def form_new
+    set_new
+    render_form
+  end
+  
+  def form_edit
+    set_edit
+    render_form
+  end
+  
+  def list_count
+    set_list
+    j = {:count => @list.count(@operators, {:id => params[:id]})}
+    respond_to do |format|
+      format.json { render json: j.to_json }
     end
   end
   
@@ -163,9 +221,9 @@ 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 = Locmare::ListGroup.list item_name, 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