temp

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

diff --git a/app/controllers/original_pictures_controller.rb b/app/controllers/original_pictures_controller.rb
index 63f5129..3c39e17 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -6,38 +6,32 @@ class OriginalPicturesController < ApplicationController
   before_filter :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_admin!, :only => [:list, :browse]
   
+  @@model = OriginalPicture
   def index
-    @page = OriginalPicture.page params[:page]
-    @page_size = OriginalPicture.page_size params[:page_size]
-    @original_pictures = OriginalPicture.mylist(@artist, @page, @page_size)
+    set_filer
 
     respond_to do |format|
-      format.html {
-        @paginate = OriginalPicture.mylist_paginate(@artist, @page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @original_pictures, :model => OriginalPicture, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @original_pictures.to_json(OriginalPicture.list_json_opt) }
+      format_filer format
+      format.json { render json: @items.to_json(@@model.list_json_opt) }
     end
   end
 
   def show
-    @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
+    @item = OriginalPicture.show(params[:id], @operators)
     
     respond_to do |format|
-      opt = {:type => @original_picture.mime_type, :disposition=>"inline"}
-      format.png { send_data(@original_picture.restore, opt ) }
-      format.gif { send_data(@original_picture.restore, opt ) }
-      format.jpeg { send_data(@original_picture.restore, opt ) }
+      opt = {:type => @item.mime_type, :disposition=>"inline"}
+      format.png { send_data(@item.restore, opt ) }
+      format.gif { send_data(@item.restore, opt ) }
+      format.jpeg { send_data(@item.restore, opt ) }
       format.html {
+        @original_picture = @item
         #ライセンス付与のために原画ライセンスグループ作成準備
-        @original_picture_license_group  = OriginalPictureLicenseGroup.new :original_picture_id => @original_picture.id
+        @original_picture_license_group  = OriginalPictureLicenseGroup.new :original_picture_id => @item.id
         render
       }
-      format.prof  { render :template => 'top/prof', :layout => true }
-      format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt)}
+      format_prof format
+      format.json { render json: @item.to_json(OriginalPicture.show_json_opt)}
     end
   end