add comic story

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

diff --git a/app/models/panel_picture.rb b/app/models/panel_picture.rb
index e806217..daea39d 100644 (file)
--- a/app/models/panel_picture.rb
+++ b/app/models/panel_picture.rb
@@ -8,8 +8,8 @@ class PanelPicture < Peta::Element
   validates :link, :length => {:maximum => 200}, :url => {:allow_blank => true, :message => I18n.t('errors.messages.url')}
   validates :x, :presence => true, :numericality => true
   validates :y, :presence => true, :numericality => true
-  validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
-  validates :height, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :resize => true, :sync_vh => true
+  validates :width, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :sync_vh => true
+  validates :height, :presence => true, :numericality => true, :not_zero => true, :reverse => true, :sync_vh => true
   validates :z, :presence => true, :numericality => {:greater_than => 0}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   
@@ -47,11 +47,6 @@ class PanelPicture < Peta::Element
     true
   end
   
-  def visible? operators
-    return false unless super
-    self.owner_model.visible? operators
-  end
-  
   def supply_default
     self.x = 0
     self.y = 0
@@ -71,12 +66,13 @@ class PanelPicture < Peta::Element
   
   def flip
     res = (self.height > 0 ? '' : 'v') + (self.width > 0 ? '' : 'h')
-    res += '/' unless res.empty?
+    res = res # format of /1.png?subdir=v
+    # res += '/' unless res.empty? # format of /v/1.png
     res
   end
   
   def filename
-    self.flip + self.picture.filename
+    self.picture.filename + '?subdir=' + self.flip
   end
   
   def url
@@ -105,7 +101,7 @@ class PanelPicture < Peta::Element
     self.picture.symbol_option
   end
   
-  def self.list_where
+  def self.public_list_where
     'panels.publish > 0'
   end