Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index bbdd2e8..e79e4f2 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -114,50 +114,53 @@ class ApplicationController < ActionController::Base
     set_model
     @my_list_model = Manifest.manifest.models[@my_action.item_name]
     @my_list_model_class = @my_list_model.classify
-    @list = Locmare::ListGroup.list @my_action.item_name, @my_action.list_name
+    @list = Locmare::ListGroup.list @my_action.controller.name, @my_action.action_name, @operators, params
   end
   
   def filer_list
     set_list
-    list_result = @list.open(@operators, 
-      {:id => params[:id], :page => params[:page], :page_size => params[:page_size]}
-    )
-    @items = list_result.items 
+    @items = @list.items 
     respond_to do |format|
       format.html {
-        @filer = Locmare::Filer.new @list.item_name, list_result.items, list_result, :default, @operators
+        @filer = Locmare::Filer.new @list.item_name, @items, @list.page_status, @operators
         render @filer.template_name, :locals => {
           :filer => @filer
         }
       }
-      format.json { render json:  @items.map{|i| i.attributes}.to_json }
-      # rails3.2 has problem
-      # y method defined as private
-      # attribute y conflict at PanelPicture, balloon ..etc
-      # use i.attributes[name]
-      # format.json { render json:  @items.to_json }
+      list_json_format @list, format
       format.atom 
       format.rss
     end
   end
   
+  def list_json_format list, format
+    format.json {
+      res = {
+        :page_status => list.page_status.to_hash,
+        # rails3.2 has problem
+        # y method defined as private
+        # attribute y conflict at PanelPicture, balloon ..etc
+        # use i.attributes[name]
+        :list => list.items.map{|i| i.attributes}
+        # :list => @items.to_json
+      }
+      render json:  res.to_json
+    }
+  end
+  
   def set_play
     set_list
-    @binder_controller = Manifest.manifest.controllers[params[:controller].to_s]
-    @binder_model = Manifest.manifest.models[@binder_controller.item_name]
+    @binder_action = @my_action.original
+    @binder_controller = @binder_action.controller
+    @binder_model = Manifest.manifest.models[@binder_action.item_name]
     @binder_model_class = @binder_model.classify
     @item = @binder_model_class.show(params[:id], @operators)
   end
   
   def play_list
-    @options = {:id => params[:id], :my_play => @item.own?(@operators), 
-      :offset => params[:offset], :count => params[:count], 
-      :page => params[:page], :page_size => params[:page_size]
-    }
-    list_result = @list.open(@operators, @options)
-    @items = list_result.items 
-    @count = list_result.count
-    @pager = list_result.paginate
+    @items = @list.items #.map {|sp| sp.root }
+    @count = @list.total
+    @pager = @list.page_status.pager
   end
   
   def set_show
@@ -199,7 +202,7 @@ class ApplicationController < ActionController::Base
   def render_form
     respond_to do |format|
       format.html { 
-        @form = Locmare::Bucket.factory @item.item_name, @item, true, true, @operators
+        @form = Locmare::Bucket.factory @item.item_name, 'default', @item, true, true, @operators
         render @form.template_name, :locals => {
           :form => @form
         }
@@ -295,7 +298,7 @@ class ApplicationController < ActionController::Base
   
   def updated_json_format format
     format.json {
-      head :ok
+      render json: '{}', status: :ok
     }
   end
   
@@ -363,7 +366,7 @@ class ApplicationController < ActionController::Base
   
   def destroyed_json_format format
     format.json {
-      head :ok
+      render json: '{}', status: :ok
     }
   end
   
@@ -394,14 +397,6 @@ class ApplicationController < ActionController::Base
     end
   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
-  
   def format_filer format
     format.html {
       @paginate = @@model.list_paginate(@page, @page_size)
@@ -421,10 +416,9 @@ class ApplicationController < ActionController::Base
     }
   end
   
-  def assist_items item_name, 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
+  def assist_items controller_name, action_name
+    list = Locmare::ListGroup.list controller_name, action_name, @operators, {:id => @item.id, :page => 1, :page_size => 5}
+    list.items
   end
   
   def set_image(file)