X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fdemander.rb;h=c1d6fd0a9aee3deb0e694358138c630d7d2d4034;hb=0174862d186425888ff64ffe1fa52c6266708049;hp=f343470b33c640208781f04035931b40560335bd;hpb=fb0b22756b8a05bec524267aaec99c5935dc6803;p=pettanr%2Fpettanr.git

diff --git a/app/models/demander.rb b/app/models/demander.rb
index f343470b..c1d6fd0a 100644
--- a/app/models/demander.rb
+++ b/app/models/demander.rb
@@ -2,13 +2,13 @@ class Demander < ActiveRecord::Base
   belongs_to :demand_user
   belongs_to :demander_status
   
-  validates :demand_user_id, :presence => true, :numericality => true, :existence => true
+  validates :demand_user_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :name, :presence => true, :length => {:maximum => 50}, :uniqueness => true
   validates :caption, :presence => true, :length => {:maximum => 30}
-  validates :url, :presence => true, :length => {:maximum => 200}, :url => true
+  validates :url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
   validates :description, :presence => true
-  validates :demander_url, :presence => true, :length => {:maximum => 200}, :url => true
-  validates :demander_status_id, :presence => true, :numericality => true, :existence => true
+  validates :demander_url, :presence => true, :length => {:maximum => 200}, :url => {:message => I18n.t('errors.messages.url')}
+  validates :demander_status_id, :presence => true, :numericality => true, :existence => {:both => false}
   
   def supply_default
   end
@@ -118,24 +118,34 @@ class Demander < ActiveRecord::Base
     self.demander_status.stop
   end
   
-  def licenses_export date_str = nil
+  def licenses_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    License.export date_str
+    License.export date
   end
   
-  def artists_export date_str = nil
+  def artists_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    Artist.export date_str
+    Artist.export date
   end
   
-  def original_pictures_export date_str = nil
+  def original_pictures_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    OriginalPicture.export date_str
+    OriginalPicture.export date
   end
   
-  def pictures_export date_str = nil
+  def pictures_export date = nil
     raise ActiveRecord::Forbidden unless self.status == 3
-    Picture.export date_str
+    Picture.export date
+  end
+  
+  def export date
+    raise ActiveRecord::Forbidden unless self.status == 3
+    {
+      :licenses => self.licenses_export(date), 
+      :artists => self.artists_export(date), 
+      :original_pictures => self.original_pictures_export(date), 
+      :pictures => self.pictures_export(date)
+    }
   end
   
 end