alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed ordering of widgets and also some widget layout problem

This commit is contained in:
Harry Bomrah 2014-06-04 16:22:48 +08:00
parent b55e4b654b
commit 72a027c91c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/page_parts_controller.rb
View File

@ -54,6 +54,9 @@ class PagePartsController < ApplicationController
@multiselect = @widget_settings['multiselect'] rescue true @multiselect = @widget_settings['multiselect'] rescue true
@display_field = @widget_settings['display_field'] @display_field = @widget_settings['display_field']
end end
elsif @widget_settings.nil?
@widget_settings = {}
@widget_settings['override_category_with'] = nil
end end
end end
@no_orbit_bar = @no_side_bar = true @no_orbit_bar = @no_side_bar = true
@ -78,6 +81,9 @@ class PagePartsController < ApplicationController
page_part.destroy page_part.destroy
end end
else else
if final_params['categories'].nil?
final_params['categories'] = []
end
subpart.update_attributes(final_params) subpart.update_attributes(final_params)
end end
render :json => {"success"=>true}.to_json render :json => {"success"=>true}.to_json
@ -107,6 +113,9 @@ class PagePartsController < ApplicationController
@multiselect = @widget_settings['multiselect'] rescue true @multiselect = @widget_settings['multiselect'] rescue true
@display_field = @widget_settings['display_field'] @display_field = @widget_settings['display_field']
end end
elsif @widget_settings.nil?
@widget_settings = {}
@widget_settings['override_category_with'] = nil
end end
render :layout => false render :layout => false
end end
@ -117,7 +126,7 @@ class PagePartsController < ApplicationController
data = [] data = []
parts.each do |part| parts.each do |part|
partid = "data-pp=" + part.part_id.to_s partid = "data-pp=" + part.part_id.to_s
subparts = part.sub_parts subparts = part.sub_parts.desc(:created_at)
subpart = [] subpart = []
subparts.each do |p| subparts.each do |p|
subpart << {"module" => p.module, "widget" => p.widget_type, "id" => p.id.to_s, "kind" => p.kind} subpart << {"module" => p.module, "widget" => p.widget_type, "id" => p.id.to_s, "kind" => p.kind}

2
app/controllers/pages_controller.rb
View File

@ -177,7 +177,7 @@ class PagesController < ApplicationController
@part_partials = {} @part_partials = {}
parts.each do |part| parts.each do |part|
subparts = part.sub_parts subparts = part.sub_parts.asc(:created_at)
partials = [] partials = []
subparts.each do |subpart| subparts.each do |subpart|
if subpart.kind == "module_widget" if subpart.kind == "module_widget"

2
app/views/page_parts/_widget_form.html.erb
View File

@ -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))) %> <%= select_tag("page_part[sub_parts_attributes][#{@select_number}][widget_method]",options_for_select(@widget_methods, (@subpart.widget_method rescue nil))) %>
</div> </div>
</div> </div>
<% if @widget_settings['override_category_with'].nil? %> <% if @widget_settings['override_category_with'].nil? %>
<div class="control-group"> <div class="control-group">
<label class="control-label muted">Category List :</label> <label class="control-label muted">Category List :</label>
<div class="controls"> <div class="controls">