fix for both part and page part settings
Conflicts: app/helpers/admin/page_parts_helper.rb app/views/admin/pages/reload_front_end_setting.js.erb app/views/admin/pages/reload_frontend_pages.js.erb
This commit is contained in:
1 parent
f6b600df59
commit
0f6f5aafce
17 files changed
+185
-88
No files matched your search
+29
-1
@@ -14,7 +14,12 @@ class Page < Item
|
||||
field :page_title, localize: true
|
||||
|
||||
field :frontend_style
|
||||
field :frontend_field , :type => Array
|
||||
field :frontend_field , :type => Array,:default => []
|
||||
|
||||
field :frontend_field_name , :type => Array,:default => []
|
||||
field :frontend_class , :type => Array,:default => []
|
||||
field :frontend_sat_to_link , :type => Array,:default => []
|
||||
|
||||
field :frontend_data_count
|
||||
|
||||
belongs_to :design
|
||||
@@ -32,6 +37,29 @@ class Page < Item
|
||||
self.save
|
||||
end
|
||||
|
||||
def default_widget_field_sat_to_link?(i)
|
||||
case frontend_sat_to_link[i]
|
||||
when 'true'
|
||||
true
|
||||
when 'false'
|
||||
false
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def default_widget_field_name
|
||||
return frontend_field_name
|
||||
end
|
||||
|
||||
def frontend_field=(settings)
|
||||
settings.each_with_index do |setting,index|
|
||||
self.frontend_field_name[index] = setting["field_name"]
|
||||
self.frontend_class[index] = setting["class"]
|
||||
self.frontend_sat_to_link[index] = setting["sat_to_link"]
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
def create_parts
|
||||
|
||||
+28
-11
@@ -1,5 +1,4 @@
|
||||
class PagePart
|
||||
|
||||
include Mongoid::Document
|
||||
include Mongoid::Timestamps
|
||||
|
||||
@@ -15,7 +14,12 @@ class PagePart
|
||||
field :tag, type: Array,:default => []
|
||||
|
||||
field :widget_style
|
||||
field :widget_field , :type => Array
|
||||
field :widget_field , :type => Array,:default => []
|
||||
|
||||
field :widget_field_name , :type => Array,:default => []
|
||||
field :widget_class , :type => Array,:default => []
|
||||
field :widget_sat_to_link , :type => Array,:default => []
|
||||
|
||||
field :widget_options ,:type=>Hash
|
||||
field :widget_data_count
|
||||
|
||||
@@ -25,15 +29,28 @@ class PagePart
|
||||
before_save :delete_empty_widget_field
|
||||
after_save :update_parent
|
||||
|
||||
# def module_app
|
||||
# if self[:module_app]
|
||||
# self[:module_app]
|
||||
# elsif self[:kind] == 'module_widget'
|
||||
# self.page.module_app
|
||||
# else
|
||||
# nil
|
||||
# end
|
||||
# end
|
||||
def default_widget_field_sat_to_link?(i)
|
||||
case widget_sat_to_link[i]
|
||||
when 'true'
|
||||
true
|
||||
when 'false'
|
||||
false
|
||||
else
|
||||
nil
|
||||
end
|
||||
end
|
||||
|
||||
def default_widget_field_name
|
||||
return widget_field_name
|
||||
end
|
||||
|
||||
def widget_field=(settings)
|
||||
settings.each_with_index do |setting,index|
|
||||
self.widget_field_name[index] = setting["field_name"]
|
||||
self.widget_class[index] = setting["class"]
|
||||
self.widget_sat_to_link[index] = setting["sat_to_link"]
|
||||
end
|
||||
end
|
||||
|
||||
protected
|
||||
|
||||
|
||||
Reference in new issue
Block a user