X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fapplication_controller.rb;h=0016b3d4ebef0ecc47cb2c88249533e638f772fc;hb=30e0eb45652d2f78a327be7e49534de11ecea74a;hp=235e0ef59c7f7901f6f04ea5e1accfb4dcf19589;hpb=eff044772f42afece0e021e0142974b67bfd978c;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 235e0ef5..0016b3d4 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -66,8 +66,8 @@ class ApplicationController < ActionController::Base
     authenticate_user! unless @operators.user?
   end
   
-  def authenticate_user
-    authenticate_user! unless @operators.user?
+  def authenticate_resource_reader
+    authenticate_user! unless @operators.resource_reader?
   end
   
   def authenticate_admin
@@ -126,11 +126,13 @@ class ApplicationController < ActionController::Base
   
   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 = Locmare::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
         }
@@ -141,12 +143,17 @@ 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 = Locmare::Profiler.new @my_model.model_name, @item, @operators
@@ -163,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 = Locmare::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
         }