X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fground_color.rb;h=588196e4f117d25783f9c618f674ed1a65c7b7bb;hb=cc2dbf353c285c78423a8a29d7adf233e1651c6e;hp=581cfa92f5ca33e02088eef98f840e92b3b5d7da;hpb=e6d20eec0a3241ee66d69a9be5c4e2e1f70b0dfc;p=pettanr%2Fpettanr.git diff --git a/app/models/ground_color.rb b/app/models/ground_color.rb index 581cfa92..588196e4 100644 --- a/app/models/ground_color.rb +++ b/app/models/ground_color.rb @@ -11,25 +11,14 @@ class GroundColor < Peta::Element validates :z, :presence => true, :numericality => {:greater_than => 0} validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0} - def self.list_opt_for_panel + def self.by_author_list_includes { - :ground_colors => { + :panel => { + :author => {} } } end - def self.show_opt_for_panel - { - :ground_colors => { - } - } - end - - def self.json_opt_for_panel - { - } - end - def self.has_picture? false end @@ -46,11 +35,6 @@ class GroundColor < Peta::Element self.panel_id = pid end - def visible? operators - return false unless super - self.owner_model.visible? operators - end - def div_offset xy ? xy : 0 end @@ -102,49 +86,14 @@ class GroundColor < Peta::Element r end - def self.list_where + def self.public_list_where list 'panels.publish > 0' end - def self.list_order - 'ground_colors.updated_at desc' - end - - def self.list_opt - {:panel => {:author => {}} } - end - - def self.list_json_opt - {:include => {:panel => {:include => {:author => {}}} }} - end - def self.show_opt {:include => {:panel => {:author => {}} }} end - def self.show_json_opt - {:include => {:panel => {:include => {:author => {}}} }} - end - - def store operators - if self.new_record? - self.panel.ground_colors.build(self.attributes) - else - self.panel.ground_colors.each do |ground_color| - next unless ground_color == self - attr = self.attributes - attr.delete 'id' - ground_color.attributes = attr - break - end - end - self.panel.store({}, operators) - end - - def remove operators - self.panel.remove_element(self, operators) - end - def scenario if caption.blank? ''