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
t#30558:fix auth filter
[pettanr/pettanr.git]
/
app
/
controllers
/
panel_colors_controller.rb
diff --git
a/app/controllers/panel_colors_controller.rb
b/app/controllers/panel_colors_controller.rb
index
3c822bb
..
eaaf34d
100644
(file)
--- a/
app/controllers/panel_colors_controller.rb
+++ b/
app/controllers/panel_colors_controller.rb
@@
-2,9
+2,11
@@
class PanelColorsController < ApplicationController
layout 'test' if MagicNumber['test_layout']
if MagicNumber['run_mode'] == 0
before_filter :authenticate_user, :only => []
layout 'test' if MagicNumber['test_layout']
if MagicNumber['run_mode'] == 0
before_filter :authenticate_user, :only => []
+ before_filter :authenticate_author, :only => []
else
before_filter :authenticate_reader, :only => [:index, :show]
before_filter :authenticate_user, :only => []
else
before_filter :authenticate_reader, :only => [:index, :show]
before_filter :authenticate_user, :only => []
+ before_filter :authenticate_author, :only => []
end
# GET /ground_pictures
end
# GET /ground_pictures
@@
-21,7
+23,7
@@
class PanelColorsController < ApplicationController
end
def show
end
def show
- @panel_color = PanelColor.show(params[:id],
@author
)
+ @panel_color = PanelColor.show(params[:id],
[@user, @admin]
)
respond_to do |format|
format.html # show.html.erb
format.json { render json: @panel_color.to_json(PanelColor.show_json_opt) }
respond_to do |format|
format.html # show.html.erb
format.json { render json: @panel_color.to_json(PanelColor.show_json_opt) }