X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fpanel.rb;h=ad20b014db00fb2960b05c5b1db04fdb35ed3f8e;hb=cb811687cd15adff98b30f841617e35b8e3ccb85;hp=4ef23f9e1d2c50b049ec830a4bde1b370c9f8ef2;hpb=6945f99e15e7ac499dc52e7af30fbff1499a6e78;p=pettanr%2Fpettanr.git

diff --git a/app/models/panel.rb b/app/models/panel.rb
index 4ef23f9e..ad20b014 100644
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -68,20 +68,6 @@ class Panel < Peta::Root
     'panels.publish > 0'
   end
   
-  def self.list_order
-    'panels.updated_at desc'
-  end
-  
-  def self.list_opt
-    r = {
-      :author => {}
-    }
-    self.child_models.each do |child_model|
-      r.merge!(child_model.list_opt_for_panel)
-    end
-    r
-  end
-  
   def self.show_opt
     r = {
       :author => {}
@@ -92,57 +78,14 @@ class Panel < Peta::Root
     {:include => r}
   end
   
-  def parts_element
-    self.elements_items
-  end
-  
-  def zorderd_elements
-    res = []
-    self.parts_element.each do |e|
-      res[e.z-1] = e
-    end
-    res
-  end
-  
-  def panel_elements
-    res = []
-    self.parts_element.each do |e|
-      res[e.t] = e
-    end
-    res
-  end
-  
-  def elements
-    self.panel_elements.map {|e|
-      #(-_-;)<... kore wa hidoi
-      JSON.parse e.to_json({:include => e.class.json_opt_for_panel})
-    }
-  end
-  
-  def panel_elements_as_json
-    self.to_json({:include => {:author => {}}, :methods => :elements})
-  end
-  
-  def self.list_as_json_text ary
-    '[' + ary.map {|i| i.panel_elements_as_json }.join(',') + ']'
-  end
-  
-  def new_t
-    self.panel_elements.size
-  end
-  
-  def new_z
-    self.panel_elements.size + 1
-  end
-  
   def scenario
-    panel_elements.map { |e|
+    scenario_elements.map { |e|
       e.scenario
     }.join
   end
   
   def plain_scenario
-    panel_elements.map { |e|
+    scenario_elements.map { |e|
       e.plain_scenario
     }.join
   end
@@ -157,146 +100,11 @@ class Panel < Peta::Root
   
   def licensed_pictures
     r = {}
-    self.panel_elements.each do |elm|
+    self.scenario_elements.each do |elm|
       next unless elm.class.has_picture?
       r[elm.picture_id] = elm.picture unless r[elm.picture_id]
     end
     r
   end
   
-  def self.visible_count
-    Panel.count
-  end
-  
-  def self.collect_element_value elements, name
-    elements.map {|e|
-      if e['_destroy'] or e[:_destroy]
-        nil
-      else
-        e[name]
-      end
-    }
-  end
-  
-  def self.validate_serial ary, offset = 0
-    i = offset
-    ary.compact.sort.each do |n|
-      break false unless n == i
-      i += 1
-    end
-    ary.compact.size == i - offset
-  end
-  
-  def self.validate_element_serial elements, name, offset = 0
-    Panel.validate_serial(Panel.collect_element_value(elements, name), offset)
-  end
-  
-  def self.validate_elements_serial c
-    c.map {|conf|
-      Panel.validate_element_serial(conf[:elements], conf[:name], conf[:offset]) ? nil : false
-    }.compact.empty?
-  end
-  
-  def validate_serial_list
-    [
-      {:elements => self.elements_items, :name => :t, :offset => 0}, 
-      {:elements => self.elements_items, :name => :z, :offset => 1}
-    ]
-  end
-  def validate_child
-#    r1 = Panel.validate_elements_id validate_id_list
-    Panel.validate_elements_serial validate_serial_list
-  end
-  
-  def store attr, operators
-    if attr == false
-      self.errors.add :base, I18n.t('errors.invalid_json')
-      return false
-    end
-    self.attributes = attr
-    self.overwrite operators
-    res = false
-    Panel.transaction do
-      self.boosts 'post'
-#self.publish = nil
-      res = self.save
-      unless validate_child
-        res = false
-        self.errors.add :base, I18n.t('errors.invalid_t')
-        raise ActiveRecord::Rollback
-      end
-    end
-    res
-  end
-  
-  def remove_element target, operators
-    ct = target.t
-    cz = target.z
-    panel_attributes = {}
-    self.panel_elements.each do |elm|
-      attr = elm.attributes
-      if elm == target
-        attr['_destroy'] = true
-      end
-      if elm.t > ct
-        attr['t']  -= 1 
-      end
-      if elm.z > cz
-        attr['z']  -= 1 
-      end
-      panel_attributes[elm.class.to_s.tableize + '_attributes'] ||= {}
-      panel_attributes[elm.class.to_s.tableize + '_attributes'][elm.id] = attr
-    end
-    self.store(panel_attributes, operators)
-  end
-  
-  def destroy_with_elements
-    res = false
-    Panel.transaction do
-      self.parts_element.each do |element|
-        raise ActiveRecord::Rollback unless element.destroy
-      end
-      raise ActiveRecord::Rollback unless self.destroy
-      res = true
-    end
-    res
-  end
-  
-  def self.panelize panel
-    attr = panel.attributes
-    attr.delete 'id'
-    attr
-  end
-  
-  
-=begin
-  def self.validate_id ary, pid
-    ary.map {|v|
-      if pid
-        (v == pid or v == nil) ? nil : false
-      else
-        v ? false : nil
-      end
-    }.compact.empty?
-  end
-  
-  def self.validate_element_id elements, name, pid
-    Panel.validate_id(Panel.collect_element_value(elements, name), pid)
-  end
-  
-  def self.validate_elements_id c
-    c.map {|conf|
-      Panel.validate_element_id(conf[:elements], conf[:name], conf[:parent_id]) ? nil : false
-    }.compact.empty?
-  end
-  
-  def validate_id_list
-    r = self.speech_balloons.map {|sb|
-      {:elements => [sb.speeches, sb.balloons], :name => :speech_balloon_id, :parent_id => sb.id}
-    }
-    r.unshift({:elements => [self.panel_pictures, self.speech_balloons], :name => :panel_id, :parent_id => self.id})
-    r
-  end
-=end
-  
 end