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
/
models
/
original_picture.rb
diff --git
a/app/models/original_picture.rb
b/app/models/original_picture.rb
index
1363cc9
..
19c993d
100644
(file)
--- a/
app/models/original_picture.rb
+++ b/
app/models/original_picture.rb
@@
-56,6
+56,12
@@
class OriginalPicture < ActiveRecord::Base
pic
end
pic
end
+ def self.edit cid, artist, opt = {}
+ pic = OriginalPicture.find(cid, :include => self.show_include_opt(opt))
+ raise ActiveRecord::Forbidden unless pic.own?(artist)
+ pic
+ end
+
def self.show_include_opt opt = {}
res = {:resource_picture => {}}
res.merge!(opt[:include]) if opt[:include]
def self.show_include_opt opt = {}
res = {:resource_picture => {}}
res.merge!(opt[:include]) if opt[:include]