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

app/helpers/admin/page_parts_helper.rb

@@ -12,43 +12,42 @@ module Admin::PagePartsHelper
   def get_widget_field_rel(local_item=nil)
     local_item = @part if local_item.nil? && @part
     local_item = @item if local_item.nil? && @item
-
     case local_item
     when Page
-      admin_pages_path
+      reload_after_list_changed_admin_pages_path
     when PagePart  
-      admin_page_parts_path
+      reload_after_list_changed_admin_page_part_path
     end
   end
 
-  def link_to_field_switch(i,object_name,field_name,local_item=nil,prefill_value=nil) #link_to_field is for showing
-    local_item = @part if local_item.nil? && @part
-    local_item = @item if local_item.nil? && @item
-    res = ''
-    choosen_value = prefill_value || (local_item[field_name][i][0] rescue nil)
-
-    if choosen_value
-      choosen_field_is_link = (@module_app.widget_fields.select{|t| t[0].to_s==choosen_value}.first)[2]==:link
-    else
-      choosen_field_is_link = false
-    end 
+  def link_to_field_switch( i ,object_name,field_name,local_item=nil,assign_field_name_value=nil) #link_to_field is for showing
+    field_is_checked = nil
+    local_item = case 
+    when local_item.nil? && @part
+      @part  
+    when local_item.nil? && @item
+      @item
+    end
     
+    field_is_checked = local_item.default_widget_field_sat_to_link?(i)
+    res = hidden_field_tag "#{object_name}[#{field_name}][][sat_to_link]", 'false'
 
-    if choosen_field_is_link
-      value = case local_item
-      when Page
-        local_item[:frontend_field][i][2] rescue false
-      when PagePart
-        local_item[:widget_field][i][2] rescue false
-      end
+    unless field_is_checked.nil? and assign_field_name_value.nil?
+      origin_field = nil
 
-      res = label_tag '' do
-                check_box_tag("#{object_name}[#{field_name}_is_link][]", "true", value) + I18n.t("default_widget.field_is_link") 
-              end
-    else # choosen_field_not_link
-      res = hidden_field_tag "#{object_name}[#{field_name}_is_link][]", 'false'
-    end # of if choosen_field_is_link
+      origin_field = @module_app.widget_fields.select{|t| t.first.to_s==(assign_field_name_value || local_item.default_widget_field_name[i])}.first
 
+      if  origin_field and origin_field[2]==:link #choosen_field_is_link
+
+        res = label_tag '' do
+                  check_box_tag("#{object_name}[#{field_name}][][sat_to_link]", "true", field_is_checked) + I18n.t("default_widget.field_is_link") 
+                end
+      else # choosen_field_not_link
+        return res 
+      end # of if choosen_field_is_link
+    else
+      return res
+    end
   end
 
   def widget_field_options(i,local_item=nil)
@@ -59,25 +58,24 @@ module Admin::PagePartsHelper
       label = I18n.t("#{@module_app.key}.default_widget.#{widget_field[0]}")
       [label, widget_field[0]] 
     end
-
     case local_item
     when Page
-      options_for_select(options, (local_item[:frontend_field][i][0] if (local_item && !local_item[:frontend_field].blank? && !local_item[:frontend_field][i].blank?)) )
+      options_for_select(options, (local_item.frontend_field_name[i] if(local_item) ))
     when PagePart
-      options_for_select(options, (local_item[:widget_field][i][0] if (local_item && !local_item[:widget_field].blank? && !local_item[:widget_field][i].blank?)) )
+      options_for_select(options, (local_item.widget_field_name[i] if(local_item) ))
     end
   end
 
-  def widget_fiield_type_options(i,local_item=nil)
+  def widget_fiield_class_options(i,local_item=nil)
     options = LIST[:widget_field_type].collect{|widget_field| [widget_field.humanize, widget_field]}
     local_item = @part if local_item.nil? && @part
     local_item = @item if local_item.nil? && @item
 
     case local_item
     when Page
-      options_for_select(options, (local_item[:frontend_field][i][1] if (local_item && !local_item[:frontend_field].blank? && !local_item[:frontend_field][i].blank?)) )
+      options_for_select(options, (local_item.frontend_class[i] if (local_item) ))
     when PagePart
-      options_for_select(options, (local_item[:widget_field][i][1] if (local_item && !local_item[:widget_field].blank? && !local_item[:widget_field][i].blank?)) )
+      options_for_select(options, (local_item.widget_class[i] if (local_item) ))
     end
   end