OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
temp
[pettanr/pettanr.git]
/
app
/
controllers
/
pictures_controller.rb
diff --git
a/app/controllers/pictures_controller.rb
b/app/controllers/pictures_controller.rb
index
4f472f4
..
959f171
100644
(file)
--- a/
app/controllers/pictures_controller.rb
+++ b/
app/controllers/pictures_controller.rb
@@
-11,7
+11,7
@@
class PicturesController < ApplicationController
before_filter :authenticate_admin!, :only => [:list, :browse]
def show
before_filter :authenticate_admin!, :only => [:list, :browse]
def show
- @item = Picture.show(params[:id],
[@user, @admin, @demand_user]
)
+ @item = Picture.show(params[:id],
@operators
)
respond_to do |format|
opt = {:type => @item.mime_type, :disposition=>"inline"}
respond_to do |format|
opt = {:type => @item.mime_type, :disposition=>"inline"}