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
merge v04
[pettanr/pettanr.git]
/
app
/
controllers
/
panels_controller.rb
diff --git
a/app/controllers/panels_controller.rb
b/app/controllers/panels_controller.rb
index
85cd8ce
..
abae3f7
100644
(file)
--- a/
app/controllers/panels_controller.rb
+++ b/
app/controllers/panels_controller.rb
@@
-100,7
+100,7
@@
class PanelsController < ApplicationController
# PUT /panels/1
# PUT /panels/1.json
def update
- @panel = Panel.
show
(params[:id], @author)
+ @panel = Panel.
edit
(params[:id], @author)
if params[:json]
jsn = JSON.parse(params[:json])
end