more button fix and also new way to select more page.

This commit is contained in:
harrybomrah authored and saurabhbhatia committed 2013-11-15 15:13:58 +08:00
1 parent 7028390248
commit e129b25554
12 files changed
+50 -14

No files matched your search

@@ -12,6 +12,8 @@ class Admin::PagePartsController < OrbitBackendController
@module_app_categories = @module_app.categories
@module_app_tags = @module_app.tags
@widget_paths = ModuleApp.find(@module_app.id).widgets.map{|name, data| [t(data["i18n"]), name]} rescue []
@pages = Page.where(:module_app_id => @module_app.id)
if @part.widget_path.present?
if @part.widget_path.eql?("default_widget")
@checked_style = @part.widget_style
@@ -27,7 +29,10 @@ class Admin::PagePartsController < OrbitBackendController
# @frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
@frontend_styles = @module_app.widgets[@part.widget_path]["style"] rescue nil
@partial = 'custom_widget' if @frontend_styles.present?
end
@partial = 'more_link' unless @partial
end
@data_count = @module_app.get_registration.get_data_count.to_a rescue []
@no_orbit_bar = @side_bar = @no_header = true
@@ -74,6 +79,7 @@ class Admin::PagePartsController < OrbitBackendController
def get_display_style
@part = PagePart.find(params[:id]) rescue nil
@module_app = ModuleApp.find(params[:module_id]) rescue nil
@pages = Page.where(:module_app_id => @module_app.id)
if @module_app
if params[:val].eql?("default_widget")
@checked_style = @part.widget_path.present? ? @part.widget_style : nil if @part && @part.widget_path.eql?("default_widget")
@@ -88,6 +94,8 @@ class Admin::PagePartsController < OrbitBackendController
@frontend_styles = @module_app.widgets[params[:val]]["style"] rescue nil
@partial = 'custom_widget' if @frontend_styles.present?
end
@partial = 'more_link' unless @partial
end
end