X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fapplication_controller.rb;h=0016b3d4ebef0ecc47cb2c88249533e638f772fc;hb=30e0eb45652d2f78a327be7e49534de11ecea74a;hp=d34f15c142bbdd7b6018b5099dab7b9cbaa93704;hpb=ec3036dc9026581d95947e5ecc5b600608b036b2;p=pettanr%2Fpettanr.git diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d34f15c1..0016b3d4 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -126,7 +126,9 @@ 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 { @@ -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 @@ -176,7 +183,7 @@ class ApplicationController < ActionController::Base 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 }