X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fscrolls_controller.rb;h=943d7d27e636c458cb4f6c9ddec096641d43f636;hb=9edc3731389bcae0de05ef6045cceb6b7581cc8f;hp=33bb1f62713e6acecf89c730ca40038a04d9ab83;hpb=623fb328302e8daec437b33f9511cdb491cbc203;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/scrolls_controller.rb b/app/controllers/scrolls_controller.rb
index 33bb1f62..943d7d27 100644
--- a/app/controllers/scrolls_controller.rb
+++ b/app/controllers/scrolls_controller.rb
@@ -1,15 +1,13 @@
 class ScrollsController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   else
-    before_filter :authenticate_reader, :only => [:top, :index, :show, :play, :by_author, :by_panel]
-    before_filter :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
-    before_filter :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
-  end
-  
-  def self.model
-    Scroll
+    before_action :authenticate_reader, :only => [
+      :top, :index, :show, :play, :by_panel, :by_author
+    ]
+    before_action :authenticate_user, :only => [:new, :create, :edit, :update, :destroy]
+    before_action :authenticate_author, :only => [:new, :create, :edit, :update, :destroy]
   end
   
   def index
@@ -17,121 +15,73 @@ class ScrollsController < ApplicationController
   end
   
   def by_author
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_panel
-    filer_list
+    filer_list param: params[:id]
+  end
+  
+  def show_html_format format
+    format.html {
+      @play_list = Locmare::ListGroup.list(
+        'scroll_panels', 'by_scroll', @operators, 
+        {:id => @item.id, :page_size => -1}  # set no limit options}
+      )
+    }
   end
   
   def show
-    @item = Scroll.show(params[:id], @operators)
-
+    set_show
     respond_to do |format|
-      format.html {
-        if @operators.author
-          @new_panel_items = assist_items('panel', 'private_list')
-          @new_panel_filer = assist_filer 'panel', @new_panel_items
-        end
-      }
-      format.json { render json: @item.to_json(Scroll.show_json_opt) }
-      format_prof format
-      format.atom 
-      format.rss 
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
+  
   def play
-    @item = self.class.model.show(params[:id], @operators)
-    action_name = params[:action]
-    @action = self.class.controller.open(action_name, params, @operators)
-    @items = @action.list.items @item
+    set_play
+    play_list
     respond_to do |format|
       format.html {
-        @count = @action.list.count @item
-        @prev_offset = @action.list.prev_offset @item
-        @next_offset = @action.list.next_offset @item
-        if @operators.author
-          @new_panel_items = assist_items('panel', 'private_list')
-          @new_panel_filer = assist_filer 'panel', @new_panel_items
+        if @item.own? @operators
+          @fresh_panel_items = assist_items('panels', 'index')
+          @new_panel_items = assist_items('home', 'panels', finder: :find_private, param: @operators)
         end
       }
-      format.json { render json: @items.to_json(self.class.model.list_json_opt) }
+      list_json_format @finder, format
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_author
-    list_count
-  end
-  
-  def count_by_panel
-    list_count
-  end
-  
   def new
     form_new
   end
-
+  
   def edit
-    @scroll = Scroll.edit(params[:id], @operators)
-    respond_to do |format|
-      format.html 
-      format.js
-    end
+    form_edit
   end
-
+  
   def create
-    @scroll = Scroll.new
-    @scroll.supply_default 
-    @scroll.attributes = params[:scroll]
-    @scroll.overwrite @operators
-
-    respond_to do |format|
-      if @scroll.save
-        flash[:notice] = I18n.t('flash.notice.created', :model => Scroll.model_name.human)
-        format.html { redirect_to @scroll }
-        format.json { render json: @scroll.to_json(Scroll.show_json_opt), status: :created, location: @scroll }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_created', :model => Scroll.model_name.human)
-        format.html { render action: "new" }
-        format.json { render json: @scroll.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.new
+    @item.supply_default 
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_create
   end
-
+  
   def update
-    @scroll = Scroll.edit(params[:id], @operators)
-    @scroll.attributes = params[:scroll]
-    @scroll.overwrite @operators
-    respond_to do |format|
-      if @scroll.save
-        flash[:notice] = I18n.t('flash.notice.updated', :model => Scroll.model_name.human)
-        format.html { redirect_to @scroll }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_updated', :model => Scroll.model_name.human)
-        format.html { render action: "edit" }
-        format.json { render json: @scroll.errors, status: :unprocessable_entity }
-      end
-    end
+    set_edit
+    @item.attributes = @item.permit_params params
+    @item.overwrite @operators
+    render_update
   end
-
+  
   def destroy
-    @scroll = Scroll.edit(params[:id], @operators)
-    respond_to do |format|
-      if @scroll.destroy_with_scroll_panel
-        flash[:notice] = I18n.t('flash.notice.destroyed', :model => Scroll.model_name.human)
-        format.html { redirect_to '/home/scrolls' }
-        format.json { head :ok }
-      else
-        flash[:notice] = I18n.t('flash.notice.not_destroyed', :model => Scroll.model_name.human)
-        format.html { redirect_to @scroll }
-        format.json { render json: @scroll.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy '/home/' + @item.path_name
   end
+  
 end