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

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

diff --git a/app/models/panel.rb b/app/models/panel.rb
index f0ccdd6..cc1dc82 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -2,7 +2,7 @@
 class Panel < ActiveRecord::Base
   belongs_to :author
   belongs_to :resource_picture
-  has_many :stories
+  has_many :scroll_panels
   has_many :panel_pictures, :dependent => :destroy
   has_many :speech_balloons, :dependent => :destroy
   has_many :ground_pictures, :dependent => :destroy
@@ -15,9 +15,6 @@ class Panel < ActiveRecord::Base
   validates :width, :presence => true, :numericality => true, :natural_number => true
   validates :height, :presence => true, :numericality => true, :natural_number => true
   validates :border, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
-  validates :x, :numericality => {:allow_blank => true}
-  validates :y, :numericality => {:allow_blank => true}
-  validates :z, :numericality => {:allow_blank => true, :greater_than => 0}
   validates :author_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :publish, :presence => true, :numericality => true
   
@@ -74,6 +71,7 @@ class Panel < ActiveRecord::Base
       return false unless reader_role_check(roles)
     end
     return true if self.own?(roles)
+    return true if self.new_record?
     self.publish?
   end
   
@@ -85,8 +83,8 @@ class Panel < ActiveRecord::Base
     self.publish > 0
   end
   
-  def tag_id
-    'panel' + self.tag_panel_id
+  def tag_id c = nil
+    'panel' + self.tag_panel_id + c.to_s
   end
   
   def tag_panel_id
@@ -103,11 +101,11 @@ class Panel < ActiveRecord::Base
     }.merge(opt)
   end
   
-  def select_tag_attributes(selected, column)
+  def select_tag_attributes(selected, column, opt = {})
     [
       :last, :first, 
       {:html => {:selected => selected}}, 
-      self.field_tag_attributes(column)
+      self.field_tag_attributes(column, opt)
     ]
   end