Merge branch 'v05' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v05

[pettanr/pettanr.git] / app / models / resource_picture.rb

diff --git a/app/models/resource_picture.rb b/app/models/resource_picture.rb
index 9d113a5..c8dac50 100644 (file)
--- a/app/models/resource_picture.rb
+++ b/app/models/resource_picture.rb
@@ -162,6 +162,9 @@ class ResourcePicture < ActiveRecord::Base
     res = false
     self.overwrite self.original_picture
     ResourcePicture.transaction do
+      self.original_picture.published_at = Time.now
+      self.original_picture.stopped_at = nil
+      raise ActiveRecord::Rollback unless self.original_picture.save
       pc = self.new_picture imager
       if pc
         self.picture_id = pc.id
@@ -215,6 +218,9 @@ class ResourcePicture < ActiveRecord::Base
   def unpublish
     res = false
     ResourcePicture.transaction do
+      self.original_picture.published_at = nil
+      self.original_picture.stopped_at = Time.now
+      raise ActiveRecord::Rollback unless self.original_picture.save
       begin
         PictureIO.resource_picture_io.delete(self.filename) if PictureIO.resource_picture_io.exist?(self.filename)
         PictureIO.resource_picture_io.delete(self.filename, 'full') if PictureIO.resource_picture_io.exist?(self.filename, 'full')
@@ -232,6 +238,10 @@ class ResourcePicture < ActiveRecord::Base
     ResourcePicture.count
   end
   
+  def picture_data
+    Base64.encode64(self.restore 'full')
+  end
+  
   def credit_template
     "#{self.classname.tableize}/attributes/credit"
   end