widget & frontend field

This commit is contained in:
unknown committed 2012-08-09 15:25:30 +08:00
1 parent c0cac812c5
commit d5c55c9697
19 files changed
+604 -100

No files matched your search

+19 -1
View File
@@ -10,6 +10,10 @@ class Page < Item
field :tag
field :view_count, :type => Integer, :default => 0
field :frontend_style
field :frontend_field , :type => Array
field :frontend_data_count
belongs_to :design
belongs_to :module_app
has_one :title, :class_name => "I18nVariable", :as => :language_value, :autosave => true, :dependent => :destroy
@@ -18,7 +22,7 @@ class Page < Item
has_many :page_metas, :autosave => true, :dependent => :destroy
accepts_nested_attributes_for :page_parts, :allow_destroy => true
before_save :create_parts, :set_key
before_save :create_parts, :set_key , :delete_empty_frontend_field
# embeds_many :custom_images, :class_name => 'Image', as: :design_image
@@ -53,4 +57,18 @@ class Page < Item
end
end
def delete_empty_frontend_field
if self.frontend_field
self.frontend_field.reject! { |ff| (ff[0].blank? || ff[1].blank?) }
# self.frontend_field.each do | ff |
# if ff[0].blank? || ff[1].blank?
# self.frontend_field.delete("") if self.frontend_field
# self.frontend_field.delete(ff)
# end
# end
end
end
end
+10 -1
View File
@@ -10,6 +10,7 @@ class PagePart
field :public_r_tag_object_id, :default => nil
field :public_r_tag_option, :default => nil
field :widget_path
field :widget_style
field :widget_field , :type => Array
field :widget_data_count
@@ -20,7 +21,7 @@ class PagePart
belongs_to :page
belongs_to :module_app
before_save :set_key
before_save :set_key, :delete_empty_widget_field
def i18n_variable
@i18n_variable ||= I18nVariable.first(:conditions => {:key => 'i18n_variable', :language_value_id => self.id, :language_value_type => self.class}) rescue nil
@@ -36,5 +37,13 @@ class PagePart
title.key = 'title' if title && (title.key.blank? rescue true)
i18n_variable.key = 'i18n_variable' if i18n_variable && (i18n_variable.key.blank? rescue true)
end
def delete_empty_widget_field
if self.widget_field
self.widget_field.reject! { |wf| (wf[0].blank? || wf[1].blank?) }
end
# self.widget_field.delete("") if self.widget_field
end
end