X-Git-Url: http://git.osdn.net/view?p=pettanr%2Fpettanr.git;a=blobdiff_plain;f=app%2Fcontrollers%2Fapplication_controller.rb;h=be0c189277666059b968a9b69c57e7976c261ae6;hp=dd35650931e3c538dbb60757836fc884a28a2c37;hb=d7c8065be895b67dc453b0e11ad0f259f1ca6706;hpb=26a6de7f9a264f04424a7fcd1acacad612322210 diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index dd356509..be0c1892 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,7 +1,9 @@ class ApplicationController < ActionController::Base protect_from_forgery + protect_from_forgery with: :null_session, if: Proc.new {|c| c.request.format == 'application/json'} layout :devise_layout - before_filter :bf + before_action :bf + before_action :authenticate_user_from_token!, if: -> {params[:email].present? or request.headers[:email]} def devise_layout if devise_controller? @@ -51,6 +53,14 @@ class ApplicationController < ActionController::Base @operators = Operator.new [user, author, artist, admin, demand_user] end + def authenticate_user_from_token! + user = User.find_by(email: (params[:email] or request.headers[:email])) + if Devise.secure_compare(user.try(:authentication_token), (params[:token] or request.headers[:token])) + sign_in user, store: false + self.bf + end + end + def authenticate_reader authenticate_user! unless @operators.reader? end @@ -110,56 +120,65 @@ class ApplicationController < ActionController::Base @my_model_class = @my_model.classify end - def set_list + def set_list options = {} 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_controller.name, @my_action.action_name, @operators, params + # params merge to options + options[:page] ||= params[:page] + options[:page_size] ||= params[:page_size] + options[:order] ||= params[:order] + options[:direction] ||= params[:direction] + @finder = @my_action.find options end - def filer_list - set_list - @items = @list.items + def filer_list options = {} + set_list options respond_to do |format| format.html { - @filer = Locmare::Filer.new @list.item_name, @items, @list.page_status, @operators + @filer = Locmare::Filer.new @my_action.return_item_name, @finder, @finder, @operators render @filer.template_name, :locals => { :filer => @filer } } - 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 => @items.map{|i| i.attributes} - # :list => @items.to_json - } - render json: res.to_json - } + list_json_format @finder, format format.atom format.rss end end + def list_json_format list, format + format.json { + res = { + :page_status => { + :type => :default, :total => @finder.total_count, :total_page => @finder.total_pages, + :page => @finder.current_page, :page_size => @finder.limit_value, + :item_name => @my_action.return_item_name + }, + # rails3.2 has problem + # y method defined as private + # attribute y conflict at PanelPicture, balloon ..etc + # use i.attributes[name] + :list => list.map{|i| i.attributes} + # :list => @finder.to_json + } + render json: res.to_json + } + end + def set_play - set_list - @binder_controller = Manifest.manifest.controllers[params[:controller].to_s] - @binder_action = @my_controller.actions[params[:action].to_s] - @binder_model = Manifest.manifest.models[@binder_action.item_name] - @binder_model_class = @binder_model.classify - @item = @binder_model_class.show(params[:id], @operators) + set_model + @item = @my_model_class.show(params[:id], @operators) + options = if @item.own?(@operators) + {finder: :find_private_play, param: [params[:id], @operators]} + else + {finder: :find_play, param: params[:id]} + end + set_list options end def play_list - @options = params - @options[:my_play] = @item.own?(@operators) - list_result = @list.open(@operators) - @items = list_result.items - @count = list_result.count - @pager = list_result.paginate + @items = @finder #.map {|sp| sp.root } + @count = @finder.total_count + @pager = @finder end def set_show @@ -201,7 +220,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 } @@ -297,7 +316,7 @@ class ApplicationController < ActionController::Base def updated_json_format format format.json { - head :ok + render json: '{}', status: :ok } end @@ -365,7 +384,7 @@ class ApplicationController < ActionController::Base def destroyed_json_format format format.json { - head :ok + render json: '{}', status: :ok } end @@ -382,7 +401,7 @@ class ApplicationController < ActionController::Base } end - def render_destroy redirect_url = nil + def render_destroy redirect_url if @item.destroy respond_to do |format| destroyed_html_format format, redirect_url @@ -396,6 +415,20 @@ class ApplicationController < ActionController::Base end end + def render_destroy_by destroy_method_name, redirect_url = nil + if @item.__send__(destroy_method_name) + respond_to do |format| + destroyed_html_format format, redirect_url + destroyed_json_format format + end + else + respond_to do |format| + not_destroyed_html_format format + not_destroyed_json_format format + end + end + end + def format_filer format format.html { @paginate = @@model.list_paginate(@page, @page_size) @@ -415,10 +448,13 @@ class ApplicationController < ActionController::Base } end - def assist_items controller_name, list_name - list = Locmare::ListGroup.list controller_name, list_name, @operators, {:id => @item.id, :page => 1, :page_size => 5} - list_result = list.open(@operators) - list_result.items + def assist_items controller_name, action_name, options = {} + controller = Manifest.manifest.controllers[controller_name] + action = controller.actions[action_name] + options[:page] = 1 + options[:page_size] = 5 + finder = action.find options + finder end def set_image(file)