fix manifest

[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 30b6f44..6daff6e 100644 (file)
--- a/app/controllers/original_pictures_controller.rb
+++ b/app/controllers/original_pictures_controller.rb
@@ -1,88 +1,67 @@
 #原画
 class OriginalPicturesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_reader, :only => [:show, :history]
+  before_filter :authenticate_reader, :only => [:show, :history, :count]
   before_filter :authenticate_user, :only => [:index, :new, :edit, :create, :update, :destroy]
   before_filter :authenticate_artist, :only => [:index, :new, :edit, :create, :update, :destroy]
-  before_filter :authenticate_admin!, :only => [:list, :browse]
+  
+  def self.model
+    OriginalPicture
+  end
   
   def index
-    @page = OriginalPicture.page params[:page]
-    @page_size = OriginalPicture.page_size params[:page_size]
-    @original_pictures = OriginalPicture.mylist(@artist, @page, @page_size)
-
-    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) }
-    end
+    filer_list
   end
 
+  def show_html_format format
+    format.html {
+      @item.boosts 'post'
+      @original_picture = @item
+      #ライセンス付与のために原画ライセンスグループ作成準備
+      @original_picture_license_group  = OriginalPictureLicenseGroup.new :original_picture_id => @item.id
+      render
+    }
+  end
+  
   def show
-    @item = OriginalPicture.show(params[:id], [@artist, @admin])
-    
+    set_show
     respond_to do |format|
       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 => @item.id
-        render
-      }
-      format_prof format
-      format.json { render json: @item.to_json(OriginalPicture.show_json_opt)}
+      format.png { send_data(@item.restore(params[:subdir]), opt ) }
+      format.gif { send_data(@item.restore(params[:subdir]), opt ) }
+      format.jpeg { send_data(@item.restore(params[:subdir]), opt ) }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
 
   def history
-    @original_picture = OriginalPicture.show(params[:id], [@artist, @admin])
+    @original_picture = OriginalPicture.show(params[:id], @operators)
     @history = @original_picture.history
     
     respond_to do |format|
-      format.html # index.html.erb
+      format.html
       format.json { render json: @history.to_json }
     end
   end
   
-  def list
-    @original_pictures = OriginalPicture.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @original_pictures }
-    end
-  end
-
-  def browse
-    @original_picture = OriginalPicture.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @original_picture }
-    end
+  def count
+    list_count
   end
-
+  
   def new
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
 
     respond_to do |format|
-      format.html # new.html.erb
+      format.html
       format.js
       format.json { render json: @original_picture.to_json(OriginalPicture.show_json_opt) }
     end
   end
 
   def edit
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
     respond_to do |format|
       format.html
       format.js
@@ -97,7 +76,7 @@ class OriginalPicturesController < ApplicationController
     end
     @original_picture = OriginalPicture.new
     @original_picture.supply_default
-    @original_picture.overwrite @artist
+    @original_picture.overwrite @operators
 
     respond_to do |format|
       if @original_picture.store(@imager)
@@ -118,8 +97,8 @@ class OriginalPicturesController < ApplicationController
     else
       nil
     end
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
-    @original_picture.overwrite @artist
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
+    @original_picture.overwrite @operators
 
     respond_to do |format|
       if @original_picture.store(@imager)
@@ -135,7 +114,7 @@ class OriginalPicturesController < ApplicationController
   end
 
   def destroy
-    @original_picture = OriginalPicture.edit(params[:id], @artist)
+    @original_picture = OriginalPicture.edit(params[:id], @operators)
     
     respond_to do |format|
       if @original_picture.destroy_with_resource_picture