t#32471:add profiles

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

diff --git a/app/controllers/system_pictures_controller.rb b/app/controllers/system_pictures_controller.rb
index 0a9447d..16a0db5 100644 (file)
--- a/app/controllers/system_pictures_controller.rb
+++ b/app/controllers/system_pictures_controller.rb
@@ -1,6 +1,13 @@
 class SystemPicturesController < ApplicationController
   layout 'test' if MagicNumber['test_layout']
-  before_filter :authenticate_user!, :only => [:index, :show]
+  if MagicNumber['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_user, :only => []
+    before_filter :authenticate_author, :only => []
+  end
   before_filter :authenticate_admin!, :only => [:list, :browse, :new, :create]
 
   # GET /system_pictures
@@ -11,7 +18,13 @@ class SystemPicturesController < ApplicationController
     @system_pictures = SystemPicture.list(@page, @page_size)
 
     respond_to do |format|
-      format.html # index.html.erb
+      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
   end
@@ -19,15 +32,16 @@ class SystemPicturesController < ApplicationController
   # GET /system_pictures/1
   # GET /system_pictures/1.json
   def show
-    @system_picture = SystemPicture.show(params[:id], @author)
+    @item = SystemPicture.show(params[:id], [@user, @admin, @demand_user])
     
     respond_to do |format|
-      opt = {:type => @system_picture.mime_type, :disposition=>"inline"}
-      format.png { send_data(@system_picture.restore, opt ) }
-      format.gif { send_data(@system_picture.restore, opt ) }
-      format.jpeg { send_data(@system_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 # show.html.erb
-      format.json { render json: @system_picture.to_json(SystemPicture.show_json_opt)}
+      format_prof format
+      format.json { render json: @item.to_json(SystemPicture.show_json_opt)}
     end
   end