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 branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06
[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
5b9f7e6
..
ffb75de
100644
(file)
--- a/
app/controllers/system_pictures_controller.rb
+++ b/
app/controllers/system_pictures_controller.rb
@@
-8,7
+8,7
@@
class SystemPicturesController < ApplicationController
before_filter :authenticate_author, :only => []
end
before_filter :authenticate_admin!, :only => []
-
+
def self.model
SystemPicture
end
@@
-19,7
+19,6
@@
class SystemPicturesController < ApplicationController
def show_html_format format
format.html {
- @system_picture = @item
}
end