class PanelsController < ApplicationController
if Manifest.manifest.magic_numbers['run_mode'] == 0
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
else
- before_filter :authenticate_reader, :only => [
+ before_action :authenticate_reader, :only => [
:index, :show, :by_scroll, :by_sheet, :by_author, :by_speech_balloon_template
]
- before_filter :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
- before_filter :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_user, :only => [:new, :edit, :create, :update, :destroy]
+ before_action :authenticate_author, :only => [:new, :edit, :create, :update, :destroy]
end
private
def panel_list
set_list
- @items = @list.items
- @pager = @list.page_status.pager
+ @items = @finder
+ @pager = @finder
respond_to do |format|
format.html
- list_json_format @list, format
+ list_json_format @finder, format
format.atom
format.rss
end
end
def by_scroll
- filer_list
+ filer_list param: params[:id]
end
def by_sheet
- filer_list
+ filer_list param: params[:id]
end
def by_author
- filer_list
+ filer_list param: params[:id]
end
def by_speech_balloon_template
- filer_list
+ filer_list param: params[:id]
end
def show_html_format format
jsn = JSON.parse_no_except(params[:json])
end
@prm = if params[:panel] == nil or params[:panel].empty?
- jsn
+ jsn
else
- params[:panel]
+ @item.permit_params(params)
end
@item.class.fold_extend_settings @prm
#@item.refresh
if params[:json]
jsn = JSON.parse(params[:json])
end
- @prm = params[:panel] || jsn
+ @prm = if params[:panel] == nil or params[:panel].empty?
+ jsn
+ else
+ @item.permit_params(params)
+ end
@item.class.fold_extend_settings @prm
# @item.refresh
respond_to do |format|