t#29034:create overwrite

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

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index f719af1..eab88aa 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -2,8 +2,15 @@ class PanelPicture < ActiveRecord::Base
   belongs_to :panel
   belongs_to :resource_picture
   
+  validates :panel_id, :numericality => {:allow_blank => true}
+  validates :resource_picture_id, :presence => true, :numericality => true, :existence => true
+  validates :link, :length => {:maximum => 200}
+  validates :x, :presence => true, :numericality => true
+  validates :y, :presence => true, :numericality => true
   validates :width, :presence => true, :numericality => true, :not_zero => true
   validates :height, :presence => true, :numericality => true, :not_zero => true
+  validates :z, :presence => true, :numericality => {:greater_than => 0}
+  validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
   def flip
     res = (self.height < 0 ? '' : 'v') + (self.width == 0 ? '' : 'h')
@@ -59,7 +66,7 @@ class PanelPicture < ActiveRecord::Base
   end
   
   def self.list_json_opt
-    {:include => {:panel => {}, :resource_picture => [:artist, :license]}}
+    {:include => {:panel => {}, :resource_picture => {:artist => {}, :license => {}}}}
   end
   
 end