X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=app%2Fmodels%2Fpanel.rb;h=cc1dc823c58ea82a8bf767d7abd8b167c6c14f2b;hb=refs%2Fheads%2Fv06sheet;hp=108681a7893f8a48c0d21b9c1ceb7a3d5e000157;hpb=cccf54cd9278e0b0456533392ec42f835e280862;p=pettanr%2Fpettanr.git diff --git a/app/models/panel.rb b/app/models/panel.rb index 108681a7..cc1dc823 100644 --- 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 @@ -30,6 +27,27 @@ class Panel < ActiveRecord::Base end end + def self.each_element_class_names + Pettanr::Application.elements.each do |k, n| + yield k + end + end + + def self.class_name_to_class k + Object.const_get k + end + + def self.each_element_classes + self.each_element_class_names do |k| + e = self.class_name_to_class k + yield e + end + end + + def elements_by_class_name class_name + self.__send__ class_name.tableize + end + def supply_default self.border = 2 self.publish = 0 @@ -53,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 @@ -64,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 @@ -76,8 +95,32 @@ class Panel < ActiveRecord::Base self.tag_id + f.to_s end - def field_tree f - 'panels-' + tag_panel_id + '-' + f.to_s + def tag_attributes column = nil, opt = {} + { + :id => self.field_tag_id(column), :panel_id => self.tag_panel_id + }.merge(opt) + end + + def select_tag_attributes(selected, column, opt = {}) + [ + :last, :first, + {:html => {:selected => selected}}, + self.field_tag_attributes(column, opt) + ] + end + + def field_tag_attributes column, opt = {} + self.tag_attributes(column).merge( + {:column => column} + ).merge(opt) + end + + def tag_attr column = nil, opt = {} + self.tag_attributes(column, opt).to_attr + end + + def field_tag_attr column, no_attr, opt = {} + self.field_tag_attributes(column, no_attr, opt).to_attr end def self.default_page_size @@ -138,18 +181,13 @@ class Panel < ActiveRecord::Base end def self.list_opt - { - :panel_pictures => { - :picture => {:artist => {}, :license => {}} - }, - :speech_balloons => {:balloon => {}, :speech => {}}, - :ground_pictures => { - :picture => {:artist => {}, :license => {}} - }, - :ground_colors => { - }, + r = { :author => {} } + self.each_element_classes do |e| + r.merge!(e.list_opt_for_panel) + end + r end def self.show rid, roles @@ -169,30 +207,21 @@ class Panel < ActiveRecord::Base end def self.show_opt - {:include => { - :panel_pictures => { - :picture => {:artist => {}, :license => {}} - }, - :speech_balloons => {:balloon => {}, :speech => {}}, - :ground_pictures => { - :picture => {:artist => {}, :license => {}} - }, - :ground_colors => { - }, + r = { :author => {} - }} + } + self.each_element_classes do |e| + r.merge!(e.show_opt_for_panel) + end + {:include => r} end def parts_element - ((self.panel_pictures || []) + (self.speech_balloons || []) + (self.ground_colors || []) + (self.ground_pictures || [])).compact - end - - def parts - res = [] - self.parts_element.each do |e| - res[e.t] = e + r = [] + self.class.each_element_class_names do |k| + r += (self.elements_by_class_name(k) || []) end - res + r end def zorderd_elements @@ -204,29 +233,17 @@ class Panel < ActiveRecord::Base end def panel_elements - parts - end - - @@elm_json_opt = { - 'PanelPicture' => { - :picture => {:artist => {}, :license => {}} - }, - 'SpeechBalloon' => {:balloon => {}, :speech => {}}, - 'GroundPicture' => { - :picture => {:artist => {}, :license => {}} - }, - 'GroundColor' => { - }, - } - - def self.elm_json_opt e - @@elm_json_opt[e.class.to_s] + 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 => Panel.elm_json_opt(e)}) + JSON.parse e.to_json({:include => e.class.json_opt_for_panel}) } end @@ -239,11 +256,11 @@ class Panel < ActiveRecord::Base end def new_t - self.parts.size + self.panel_elements.size end def new_z - self.parts.size + 1 + self.panel_elements.size + 1 end def scenario @@ -260,7 +277,8 @@ class Panel < ActiveRecord::Base def licensed_pictures r = {} - ((self.panel_pictures || []) + (self.ground_pictures || [])).compact.each do |elm| + self.panel_elements.each do |elm| + next unless elm.class.has_picture? r[elm.picture_id] = elm.picture unless r[elm.picture_id] end r @@ -302,9 +320,13 @@ class Panel < ActiveRecord::Base end def validate_serial_list + l = [] + self.class.each_element_class_names do |k| + l << self.elements_by_class_name(k) + end [ - {:elements => [self.panel_pictures, self.speech_balloons, self.ground_colors, self.ground_pictures], :name => :t, :offset => 0}, - {:elements => [self.panel_pictures, self.speech_balloons, self.ground_colors, self.ground_pictures], :name => :z, :offset => 1} + {:elements => l, :name => :t, :offset => 0}, + {:elements => l, :name => :z, :offset => 1} ] end def validate_child @@ -312,6 +334,16 @@ class Panel < ActiveRecord::Base Panel.validate_elements_serial validate_serial_list end + def boost + @new_element_index = 0 + self.panel_elements.each do |elm| + if elm.new_record? + elm.new_index = @new_element_index + @new_element_index += 1 + end + end + end + def store attr, au if attr == false self.errors.add :base, I18n.t('errors.invalid_json') @@ -321,6 +353,11 @@ class Panel < ActiveRecord::Base self.overwrite au res = false Panel.transaction do + self.panel_elements.each do |elm| + elm.new_panel = self + elm.boost + end +#self.publish = nil res = self.save unless validate_child res = false @@ -364,6 +401,30 @@ class Panel < ActiveRecord::Base res end + def copy + attr = self.copy_attributes + Panel.each_element_class_names do |n| + attr.merge! Panel.class_name_to_class(n).panelize(self.elements_by_class_name(n).map {|elm| elm.copy_attributes}) + end + attr + end + + def copy_attributes + r = self.attributes + r.delete 'id' + r.delete 'author_id' + r.delete 'created_at' + r.delete 'updated_at' + r + end + + def self.panelize panel + attr = panel.attributes + attr.delete 'id' + attr + end + + =begin def self.validate_id ary, pid ary.map {|v|