fix play

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 20d2fd6..0016b3d 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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
@@ -117,18 +121,18 @@ class ApplicationController < ActionController::Base
   
   def set_list
     set_model
-    @my_model_list = @my_model.lists[@my_action.list_name]
-    @list_group = Manifest.manifest.list_groups[@my_action.item_name]
-    @list = @list_group.lists[@my_action.list_name]
+    @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]})
+    list_result = @list.open(@operators, 
+      {:id => params[:id], :page => params[:page], :page_size => params[:page_size]}
+    )
     @items = list_result.items 
     respond_to do |format|
       format.html {
-        @filer = Manifest::View::Filer.new @list.item_name, list_result.items, list_result.paginate, @operators
+        @filer = Locmare::Filer.new @list.item_name, list_result.items, list_result, :default, @operators
         render @filer.template_name, :locals => {
           :filer => @filer
         }
@@ -139,15 +143,20 @@ class ApplicationController < ActionController::Base
     end
   end
   
+  def set_play
+    set_model
+    @list = Locmare::ListGroup.list @my_action.item_name, @my_action.list_name
+  end
+  
   def set_show
     set_model
     @item = @my_model_class.show(params[:id], @operators)
   end
   
- def show_prof_format format
+  def show_prof_format format
     format.prof {
       self.formats = [:html]
-      @profiler = Manifest::View::Profiler.new @my_model.model_name, @item, @operators
+      @profiler = Locmare::Profiler.new @my_model.model_name, @item, @operators
       render @profiler.template_name, :locals => {
         :profiler => @profiler
       }
@@ -161,18 +170,20 @@ class ApplicationController < ActionController::Base
   def set_new
     set_model
     @item = @my_model_class.new
+    @item.boosts 'post'
     @item.supply_default
   end
   
   def set_edit
     set_model
     @item = @my_model_class.edit(params[:id], @operators)
+    @item.boosts 'post'
   end
   
   def render_form
     respond_to do |format|
       format.html { 
-        @form = Manifest::View::Form.new @item.item_name, @item, true, true, @operators
+        @form = Locmare::Bucket.factory @item.item_name, @item, true, true, @operators
         render @form.template_name, :locals => {
           :form => @form
         }
@@ -219,13 +230,12 @@ class ApplicationController < ActionController::Base
   end
   
   def assist_items item_name, list_name
-    list = Manifest.manifest.list_groups[item_name].lists[list_name]
+    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
-    @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