From 72a027c91c1ad74fba8d3588e143d9b0cd82cc36 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Wed, 4 Jun 2014 16:22:48 +0800
Subject: [PATCH] fixed ordering of widgets and also some widget layout problem

---
 app/controllers/page_parts_controller.rb   | 11 ++++++++++-
 app/controllers/pages_controller.rb        |  2 +-
 app/views/page_parts/_widget_form.html.erb |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/controllers/page_parts_controller.rb b/app/controllers/page_parts_controller.rb
index bd15445..0270ca6 100644
--- a/app/controllers/page_parts_controller.rb
+++ b/app/controllers/page_parts_controller.rb
@@ -54,6 +54,9 @@ class PagePartsController < ApplicationController
           @multiselect = @widget_settings['multiselect'] rescue true
           @display_field = @widget_settings['display_field']
         end
+      elsif @widget_settings.nil?
+        @widget_settings = {}
+        @widget_settings['override_category_with'] = nil
       end
     end
     @no_orbit_bar = @no_side_bar = true
@@ -78,6 +81,9 @@ class PagePartsController < ApplicationController
         page_part.destroy
       end
     else
+      if final_params['categories'].nil?
+        final_params['categories'] = []
+      end
       subpart.update_attributes(final_params)
     end
     render :json => {"success"=>true}.to_json
@@ -107,6 +113,9 @@ class PagePartsController < ApplicationController
         @multiselect = @widget_settings['multiselect'] rescue true
         @display_field = @widget_settings['display_field']
       end
+    elsif @widget_settings.nil?
+      @widget_settings = {}
+      @widget_settings['override_category_with'] = nil
     end
     render :layout => false
   end
@@ -117,7 +126,7 @@ class PagePartsController < ApplicationController
     data = []
     parts.each do |part|
       partid = "data-pp=" + part.part_id.to_s
-      subparts = part.sub_parts
+      subparts = part.sub_parts.desc(:created_at)
       subpart = []
       subparts.each do |p|
         subpart << {"module" => p.module, "widget" => p.widget_type, "id" => p.id.to_s, "kind" => p.kind}
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 6ce2399..6d63fc4 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -177,7 +177,7 @@ class PagesController < ApplicationController
       @part_partials = {}
 
       parts.each do |part|
-        subparts = part.sub_parts
+        subparts = part.sub_parts.asc(:created_at)
         partials = []
         subparts.each do |subpart|
           if subpart.kind == "module_widget"
diff --git a/app/views/page_parts/_widget_form.html.erb b/app/views/page_parts/_widget_form.html.erb
index 6a06cd2..f7395e8 100644
--- a/app/views/page_parts/_widget_form.html.erb
+++ b/app/views/page_parts/_widget_form.html.erb
@@ -10,7 +10,7 @@
 		<%= select_tag("page_part[sub_parts_attributes][#{@select_number}][widget_method]",options_for_select(@widget_methods, (@subpart.widget_method rescue nil))) %>
 	</div>
 </div>
-<% if @widget_settings['override_category_with'].nil? %>
+<% if @widget_settings['override_category_with'].nil?  %>
 	<div class="control-group">
 		<label class="control-label muted">Category List :</label>
 		<div class="controls">