X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fcontrollers%2Fsystem_pictures_controller.rb;h=ffb75debc917ddf3e24da36d3be874f156b57048;hb=85d27b03ef74a6d4775fc345a9f59c9e1736e7c1;hp=7b5bcf6b343240c5995fe73f4aed91b8a8a784f8;hpb=387de02ada617308cad50c4bd35e8dbb05c28be4;p=pettanr%2Fpettanr.git

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index 7b5bcf6b..ffb75deb 100644
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,55 +1,42 @@
 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]
-
+  before_filter :authenticate_admin!, :only => []
+  
   def self.model
     SystemPicture
   end
   
   def index
-    public_list
+    filer_list
+  end
+  
+  def show_html_format format
+    format.html {
+    }
   end
-
+  
   def show
-    @item = SystemPicture.show(params[:id], @operators)
-    
+    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 {
-        @system_picture = @item
-      }
-      format_prof format
-      format.json { render json: @item.to_json(SystemPicture.show_json_opt)}
+      show_html_format format
+      show_prof_format format
+      show_json_format format
     end
   end
-
-  def list
-    @system_pictures = SystemPicture.all
-
-    respond_to do |format|
-      format.html { render layout: 'system' }
-      format.json { render json: @system_pictures }
-    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