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#30137:fix authenticate
[pettanr/pettanr.git]
/
app
/
controllers
/
balloons_controller.rb
diff --git
a/app/controllers/balloons_controller.rb
b/app/controllers/balloons_controller.rb
index
fda6a8b
..
cb01d58
100644
(file)
--- a/
app/controllers/balloons_controller.rb
+++ b/
app/controllers/balloons_controller.rb
@@
-20,7
+20,7
@@
class BalloonsController < ApplicationController
end
def show
- @balloon = Balloon.show(params[:id],
@author
)
+ @balloon = Balloon.show(params[:id],
[@author, @admin]
)
respond_to do |format|
format.html # show.html.erb
format.json { render json: @balloon.to_json(Balloon.show_json_opt) }