more button fix and also new way to select more page.
This commit is contained in:
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
|
||||
|
||||
|
||||
@@ -39,6 +39,7 @@ class DefaultWidgetController< OrbitWidgetController
|
||||
end
|
||||
|
||||
def default_widget
|
||||
|
||||
@search = params["search_query"].blank? ? false : true
|
||||
if !params[:id].blank? and !params["clicked_field_name"].blank?
|
||||
clicked_field_name = params["clicked_field_name"].to_sym
|
||||
@@ -91,6 +92,8 @@ class DefaultWidgetController< OrbitWidgetController
|
||||
@tag_class = 'default_widget_typeC'
|
||||
@partial = "typeC"
|
||||
end
|
||||
@more_url = Page.find(@page_part.more_link).path rescue nil
|
||||
# debugger
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
@@ -70,7 +70,6 @@ class PagesController < ApplicationController
|
||||
elsif params[:category_id].is_a? String
|
||||
options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
|
||||
end
|
||||
|
||||
if params[:tag_id].is_a? Array
|
||||
options << "#{options.blank? ? '?' : '&'}#{convert_array_param('tag_id',params[:tag_id])}" unless params[:tag_id].blank?
|
||||
elsif params[:category_id].is_a? String
|
||||
@@ -81,7 +80,7 @@ class PagesController < ApplicationController
|
||||
options << "#{options.blank? ? '?' : '&'}search_query=#{params[:search_query]}" unless params[:search_query].blank?
|
||||
options << "#{options.blank? ? '?' : '&'}name=#{params[:name]}" unless params[:name].blank?
|
||||
uri = URI::escape(url + options)
|
||||
#uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
|
||||
# uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
|
||||
redirect_to(uri)unless save_from_no_lang_for_page
|
||||
end
|
||||
|
||||
@@ -105,6 +104,7 @@ class PagesController < ApplicationController
|
||||
protected
|
||||
|
||||
def get_item
|
||||
|
||||
if params[:page_id]
|
||||
@item = Item.find(params[:page_id])
|
||||
elsif params[:same_page_id]
|
||||
|
||||
Reference in new issue
Block a user