X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fsystem_pictures_controller.rb;h=a0175e1de9be1d8dba19abf91889308b8134c7f2;hb=f52d305f8c8857da0a38049e85ebd37e3525c8c8;hp=16a0db5979632e9177b59a2792cc4a1605e7e28b;hpb=eb5aee94f87dd1a2c7ee7a5a6a0e88ae3e235166;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index 16a0db59..a0175e1d 100644
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,66 +1,38 @@
 class SystemPicturesController < ApplicationController
-  layout 'test' if MagicNumber['test_layout']
-  if MagicNumber['run_mode'] == 0
+  if Manifest.manifest.magic_numbers['run_mode'] == 0
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   else
-    before_filter :authenticate_resource_reader, :only => [:index, :show]
+    before_filter :authenticate_resource_reader, :only => [:index, :show, :count]
     before_filter :authenticate_user, :only => []
     before_filter :authenticate_author, :only => []
   end
-  before_filter :authenticate_admin!, :only => [:list, :browse, :new, :create]
-
-  # GET /system_pictures
-  # GET /system_pictures.json
+  before_filter :authenticate_admin!, :only => []
+  
   def index
-    @page = SystemPicture.page params[:page]
-    @page_size = SystemPicture.page_size params[:page_size]
-    @system_pictures = SystemPicture.list(@page, @page_size)
-
-    respond_to do |format|
-      format.html {
-        @paginate = SystemPicture.list_paginate(@page, @page_size)
-        render :template => 'system/filer', :locals => {
-          :items => @system_pictures, :model => SystemPicture, 
-          :roles => [@user, @admin], :pager => @paginate
-        }
-      }
-      format.json { render json: @system_pictures.to_json(SystemPicture.list_json_opt) }
-    end
+    filer_list
   end
-
-  # GET /system_pictures/1
-  # GET /system_pictures/1.json
+  
+  def show_html_format format
+    format.html {
+    }
+  end
+  
   def show
-    @item = SystemPicture.show(params[:id], [@user, @admin, @demand_user])
-    
+    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 # show.html.erb
-      format_prof format
-      format.json { render json: @item.to_json(SystemPicture.show_json_opt)}
-    end
-  end
-
-  def list
-    @system_pictures = SystemPicture.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @system_pictures }
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
-  def browse
-    @system_picture = SystemPicture.find(params[:id])
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @system_picture}
-    end
+  
+  def count
+    list_count
   end
-
+  
 end