X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fresource_pictures_controller.rb;h=a392b4c2d1666504b28094c05e1e706d2f81577d;hb=6a9125ccbacea489311fc4cc548ac03e7d0b412d;hp=bae6ac714f1ea0383aaf734ec3af155f4654abf5;hpb=665761e56525215946e2547a70c82c603d5047af;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/resource_pictures_controller.rb b/app/controllers/resource_pictures_controller.rb
index bae6ac71..a392b4c2 100644
--- a/app/controllers/resource_pictures_controller.rb
+++ b/app/controllers/resource_pictures_controller.rb
@@ -1,29 +1,34 @@
 class ResourcePicturesController < ApplicationController
   if Manifest.manifest.magic_numbers['run_mode'] == 0
-    before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
-    before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
   else
-    before_filter :authenticate_resource_reader, :only => [
-      :index, :show, :credit, :by_license_group, :by_license, :by_artist, :count, :count_by_license_group, :count_by_license, :count_by_artist
+    before_action :authenticate_resource_reader, :only => [
+      :index, :show, :credit, 
+      :by_original_picture, :by_license_group, :by_license, :by_artist
     ]
-    before_filter :authenticate_user, :only => [:new, :create, :update, :destroy]
-    before_filter :authenticate_artist, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_user, :only => [:new, :create, :update, :destroy]
+    before_action :authenticate_artist, :only => [:new, :create, :update, :destroy]
   end
   
   def index
     filer_list
   end
   
+  def by_original_picture
+    filer_list param: params[:id]
+  end
+  
   def by_license_group
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_license
-    filer_list
+    filer_list param: params[:id]
   end
   
   def by_artist
-    filer_list
+    filer_list param: params[:id]
   end
   
   def show_html_format format
@@ -53,22 +58,6 @@ class ResourcePicturesController < ApplicationController
     end
   end
   
-  def count
-    list_count
-  end
-  
-  def count_by_license_group
-    list_count
-  end
-  
-  def count_by_license
-    list_count
-  end
-  
-  def count_by_artist
-    list_count
-  end
-  
   def new
     # use @item, @original_picture
     respond_to do |format|
@@ -83,12 +72,12 @@ class ResourcePicturesController < ApplicationController
     if params[:json]
       jsn = JSON.parse_no_except(params[:json])
     end
+    @item = @original_picture.resource_picture || ResourcePicture.new
     @prm = if params[:resource_picture] == nil or params[:resource_picture].empty?
-       jsn
+      jsn
     else
-       params[:resource_picture]
+      @item.permit_params(params)
     end
-    @item = @original_picture.resource_picture || ResourcePicture.new
     @item.attributes = @prm
     @item.overwrite @original_picture
     @item.boosts 'post'
@@ -105,17 +94,9 @@ class ResourcePicturesController < ApplicationController
   end
   
   def destroy
-    @resource_picture = ResourcePicture.edit(params[:id], @operators)
-
-    respond_to do |format|
-      if @resource_picture.unpublish
-        format.html { redirect_to :controller => '/home', :action => :resource_pictures }
-        format.json { head :ok }
-      else
-        format.html { redirect_to resource_picture_path(@resource_picture) }
-        format.json { render json: @resource_picture.errors, status: :unprocessable_entity }
-      end
-    end
+    set_model
+    @item = @my_model_class.edit(params[:id], @operators)
+    render_destroy_by 'unpublish', '/home/' + @item.path_name
   end
   
   def count