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
add: license publisher
[pettanr/pettanr.git]
/
app
/
models
/
provider_original_picture.rb
diff --git
a/app/models/provider_original_picture.rb
b/app/models/provider_original_picture.rb
index
78e8f1c
..
de173fb
100644
(file)
--- a/
app/models/provider_original_picture.rb
+++ b/
app/models/provider_original_picture.rb
@@
-166,17
+166,24
@@
class ProviderOriginalPicture < ActiveRecord::Base
end
def self.import pid, original_pictures, pictures
end
def self.import pid, original_pictures, pictures
- res =
{:original_pictures => [], :pictures => [], :resource_pictures => []}
+ res =
nil
ProviderOriginalPicture.transaction do
r = ProviderOriginalPicture.import_original_pictures(pid, original_pictures)
ProviderOriginalPicture.transaction do
r = ProviderOriginalPicture.import_original_pictures(pid, original_pictures)
- res[:original_pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = OriginalPictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
r = ProviderOriginalPicture.import_pictures(pid, pictures)
r = ProviderOriginalPicture.import_pictures(pid, pictures)
- res[:pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = PictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
r = ProviderOriginalPicture.import_resource_pictures(pid, original_pictures)
r = ProviderOriginalPicture.import_resource_pictures(pid, original_pictures)
- res[:resource_pictures] = r
- raise ActiveRecord::Rollback if r.any?
+ if r.any?
+ res = ResourcePictureImportResult.new r
+ raise ActiveRecord::Rollback
+ end
+ res = OriginalPictureImportResult.new []
end
res
end
end
res
end