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/controllers/admin/page_parts_controller.rb

@@ -56,10 +56,9 @@ class Admin::PagePartsController < OrbitBackendController
   def update
 
     @part = PagePart.find(params[:id])
-  	params[:page_part][:widget_field] = params[:page_part][:widget_field].zip( params[:page_part][:widget_field_type],params[:page_part][:widget_field_is_link] ) if params[:page_part][:widget_field]
-      
-  	params[:page_part][:widget_field_type] = nil
-      params[:page_part][:widget_field_is_link]  = nil
+
+    # params[:page_part][:widget_field_type] = nil
+    # params[:page_part][:widget_field_is_link]  = nil
 
     if params[:page_part][:module_app].blank?
       params[:page_part][:module_app] = nil
@@ -73,8 +72,7 @@ class Admin::PagePartsController < OrbitBackendController
       params[:page_part][:category] = []
     end
 
-    params[:page_part][:widget_field].each{|t| t[2] = (t[2]=="true" ? true : false )} if !params[:page_part][:widget_field].blank?
-
+    # params[:page_part][:widget_field].each{|t| t[2] = (t[2]=="true" ? true : false )} if !params[:page_part][:widget_field].blank?
     if @part.update_attributes(params[:page_part])
       set_children_sub_menu(@part) if @part.public_r_tag && @part.public_r_tag.eql?('sub_menu')
       flash.now[:notice] = t('update.success.content')

app/controllers/admin/pages_controller.rb

@@ -14,6 +14,7 @@ helper Admin::PagePartsHelper
     @item = Page.new
     @item.parent = Item.find(params[:parent_id]) rescue nil
     @apps = ModuleApp.where(:key.in => OrbitApp::Module::FrontendUtility.all.keys)
+    @module_apps = ModuleApp.excludes(widgets: nil).where(enable_frontend: true).order_by(:title, :asc)
     @designs = Design.all.entries
     @design = Design.first
   end
@@ -76,8 +77,10 @@ helper Admin::PagePartsHelper
       @item.page_contexts.build(:create_user_id => current_user.id, :update_user_id => current_user.id )
     end
 	
-  params[:page][:frontend_field] = params[:page][:frontend_field].zip( params[:page][:frontend_field_type] ) if params[:page][:frontend_field] 
-  params[:page][:frontend_field_type] = nil
+    # params[:page][:frontend_field] = params[:page][:frontend_field].zip( params[:page][:frontend_field_type], params[:page][:frontend_field_is_link] ) if params[:page][:frontend_field]
+     
+    # params[:page][:frontend_field_type] = nil
+    # params[:page][:frontend_field_is_link] = nil
 
     if params[:page][:tag].nil? || params[:page][:tag].include?("nil")
       params[:page][:tag] = []
@@ -87,6 +90,9 @@ helper Admin::PagePartsHelper
       params[:page][:category] = []
     end
 
+    # params[:page][:frontend_field].each{|t| t[2] = (t[2]=="true" ? true : false )} if !params[:page][:frontend_field].blank?
+
+
     if @item.update_attributes(params[:page])
       flash[:notice] = t('update.success.page')
       respond_to do |format|
@@ -127,6 +133,9 @@ helper Admin::PagePartsHelper
 
     @app_frontend_urls = @module_app.nil? ? nil :  @module_app.app_pages.each{|name,data| [I18n.t(data["i18n"]),name]}
     @frontend_styles = @module_app.app_pages[params["frontend"]]["style"] rescue nil
+    # =======    
+    #     @chosen_frontend = @user_choose = params[:frontend]
+    # >>>>>>> Stashed changes
   end  
 
   def get_categories_and_tags
@@ -172,7 +181,7 @@ helper Admin::PagePartsHelper
   
   def reload_widget_field
     @index = params[:field_seri].to_i
-    @item = Page.find params[:id]
+    @item = params.has_key?(:id) ? Page.find(params[:id] ) : Page.new
     @choosen_field = params[:widget_field_value]
     @module_app = @page.module_app
     @module_app = ModuleApp.find params[:module_app_id] if @module_app.nil?