category click, event click and more button fix

app/controllers/default_widget_controller.rb

@@ -40,6 +40,7 @@ class DefaultWidgetController< OrbitWidgetController
 
   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
       redirect_to eval("#{@page_part.module_app.widget_fields_link_method[clicked_field_name][:method]}('#{params[:id]}', {inner: #{params[:inner] || true}})")
@@ -69,7 +70,10 @@ class DefaultWidgetController< OrbitWidgetController
         @data_limit = @page_part.widget_data_count.is_a?(Fixnum) ? @page_part.widget_data_count : (@page_part.widget_data_count.to_i rescue 3)
       end
 
-      if @paginate || @search
+      if params[:filter_category_id] and !params[:filter_category_id].blank?
+        @data = get_filter_data.page(params[:page_main]).per(@data_limit)
+        
+      elsif @paginate || @search
         if @search
           @data = search_result.page(params[:page_main]).per(@data_limit) rescue []
         else #regular listing
@@ -93,6 +97,18 @@ class DefaultWidgetController< OrbitWidgetController
       end
     end
   end
+
+  def get_filter_data
+    model = eval(@default_widget["query"])
+    if params[:filter_category_id].is_a? Array
+      data = model.where(:category_id.in => params[:filter_category_id])
+    elsif params[:filter_category_id].is_a? String
+      data = model.where(:category_id => params[:filter_category_id])
+    end
+    data.available_for_lang(I18n.locale).can_display.desc(:is_top, :postdate)
+  end
+
+  
   
   def get_category_field_name
     @ori_class_name = @ori_class_name.constantize

app/controllers/pages_controller.rb

@@ -64,23 +64,25 @@ class PagesController < ApplicationController
     url = "/#{@item.path}"
     options = ''
     options << "#{options.blank? ? '?' : '&'}page_main=#{params[:page_main]}" unless params[:page_main].blank?
+    options << "#{options.blank? ? '?' : '&'}click=#{params[:click]}" unless params[:click].blank?
+    # options << "#{options.blank? ? '?' : '&'}part_id=#{params[:page_part_id]}" unless params[:page_part_id].blank?
 
     if params[:category_id].is_a? Array
-      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('category_id',params[:category_id])}" unless params[:category_id].blank?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_category_id',params[:category_id])}" unless params[:category_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}category_id=#{params[:category_id]}" unless params[:category_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_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?
+      options << "#{options.blank? ? '?' : '&'}#{convert_array_param('filter_tag_id',params[:tag_id])}" unless params[:tag_id].blank?
       elsif params[:category_id].is_a? String
-        options << "#{options.blank? ? '?' : '&'}tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
+        options << "#{options.blank? ? '?' : '&'}filter_tag_id=#{params[:tag_id]}" unless params[:tag_id].blank?
     end
     
 
     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 + options)
+    uri = url + options
     #uri = URI::escape("#{url}?" + params.collect{|k,v| "#{k}=#{v}"}.join('&'))
     redirect_to(uri)unless save_from_no_lang_for_page
   end
@@ -105,26 +107,94 @@ class PagesController < ApplicationController
   protected
    
   def get_item
+    # if params[:page_id]
+    #   @item = Item.find(params[:page_id])
+    # elsif params[:same_page_id]
+    #   @item = Item.find(params[:same_page_id])
+    # else
+    #   category_ids = Array(params[:category_id]) unless params[:category_id].nil?
+    #   tag_ids = Array(params[:tag_id]) unless params[:tag_id].nil?
+    #   module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+
+    #   default_query = { is_published: true, module_app_id: module_app.id, :app_frontend_url.in => [params[:app_action], 'default_widget'] }
+    #   specific_categories = { :category => category_ids }
+    #   in_categories = { :category.in => category_ids }
+    #   nil_categories = { :category.in => [nil, []] }
+    #   specific_tags = { :tag => tag_ids }
+    #   in_tags = { :tag.in => tag_ids }
+    #   nil_tags = { :tag.in => [nil, []] }
+
+    #   if !category_ids.blank? && !tag_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_categories).merge(specific_tags)).first
+    #     @item = Item.where(default_query.merge(specific_categories).merge(in_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_tags).merge(in_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(in_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+    #   elsif !category_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_categories).merge(nil_tags)).first
+    #     @item = Item.where(default_query.merge(specific_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories).merge(nil_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_categories)).first unless @item
+    #   elsif !tag_ids.blank?
+    #     @item = Item.where(default_query.merge(specific_tags).merge(nil_categories)).first
+    #     @item = Item.where(default_query.merge(specific_tags)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags).merge(nil_categories)).first unless @item
+    #     @item = Item.where(default_query.merge(in_tags)).first unless @item
+    #   end
+    #   @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
+    #   @item = Item.where(default_query.merge(nil_categories).merge(nil_tags)).first unless @item
+    #   @item = Item.where(default_query).first unless @item
+    # end
+    # raise PageError, 'Missing Frontend Page' if @item.nil?
+
+    # if params[:page_id]
+    #   @item = Item.find(params[:page_id])
+    # elsif params[:same_page_id]
+    #   @item = Item.find(params[:same_page_id])
+    # else
+    #   category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
+    #   tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
+    #   module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
+    #   if !category_ids.blank? && !tag_ids.blank?
+    #     @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
+    #     @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
+    #   elsif !category_ids.blank?
+    #     @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
+    #   elsif !tag_ids.blank?
+    #     @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+    #   end
+    #   @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+    #   # @item = Item.root.children.where(:module_app_id => module_app.id).first
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
+    #   @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
+    # end
+    # raise PageError,'Missing Frontend Page' if @item.nil?
+
     if params[:page_id]
       @item = Item.find(params[:page_id])
     elsif params[:same_page_id]
       @item = Item.find(params[:same_page_id])
     else
-      category_ids = params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]
-      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
       module_app = ModuleApp.first(:conditions => {:key => params[:app_name]})
-      if !category_ids.blank? && !tag_ids.blank?
+      category_ids = params[:category_id] ? (params[:category_id].is_a?(Array) ? params[:category_id] : [params[:category_id]]) : []
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => tag_ids})
+      tag_ids = params[:tag_id].is_a?(Array) ? params[:tag_id] : [params[:tag_id]]
-        @item = Item.first(:conditions => {:module_app_id => module_app.id, :app_frontend_url => params[:app_action], :category.in => category_ids, :tag.in => [nil, []]}) unless @item
+      
-      elsif !category_ids.blank?
+      if !category_ids.blank?
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :category.in => category_ids).any_in(tag: [nil, []]).first
+        @item = Item.where(:category => category_ids).first
-      elsif !tag_ids.blank?
+      else
-        @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action], :tag.in => tag_ids).any_in(category: [nil, []]).first
+        if params[:action] && params[:action] == "show_from_link"
+          default_widget = module_app.get_default_widget
+          model = eval(default_widget["query"])
+          item = model.find(params[:id])
+          @item = Item.where(:category => [item.category_id.to_s]).first
+        end
       end
-      @item = Item.find(params[:orig_page]) unless @item || params[:orig_page].blank?
+    
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).all_of("tag" => {"$in" => [nil, []]},"category" => { "$in" => [nil, []]}).first unless @item
+      @item = Item.root.children.where(:module_app_id => module_app.id).first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: 'default_widget').first unless @item
-      @item = Item.where(module_app_id: module_app.id, app_frontend_url: params[:app_action]).first unless @item
     end
     raise PageError,'Missing Frontend Page' if @item.nil?
   end

config/mongoid.yml

@@ -8,13 +8,13 @@ defaults: &defaults
 
 development:
   <<: *defaults
-  database: test_site
+  database: orbit_site_new
 
 
 
 test:
   <<: *defaults
-  database: test_site
+  database: orbit_site_new
 
 # set these environment variables on your prod server
 production:

lib/orbit_app/helper/default_widget_tag_helper.rb

@@ -12,9 +12,9 @@ module DefaultWidgetTagHelper
       if param.is_a?(Array) and !param.blank?
         params_str << param.collect{|t| "#{index}[]=#{t}"}.join("&")
         params.delete index
+        params_str = params_str + "&"
       end
     end  
-    
     params_str = params_str + (params_str.eql?("?") ? params.to_param : "&#{params.to_param}" )
       content_tag :div,:class=> 'more' do 
   	 link_to I18n.t(@more_link[:label_i18n]),[eval("#{@more_link[:path_method]}"),params_str].join()

lib/parsers/parser_front_end.rb

@@ -24,7 +24,6 @@ module ParserFrontEnd
     # tag = params[:tag_id].blank? ? page[:tag] : params[:tag_id]
     # category = params[:category_id].blank? ? page[:category] : params[:category_id]
     body = Nokogiri::HTML(page.content)
-
     if @edit
       body.css('.page_part').each do |page_part|
         part = PagePart.find(page_part['part_id']) rescue nil
@@ -41,13 +40,16 @@ module ParserFrontEnd
     end
 
     body.css('orbit_front').each do |front|
+
       if front['value']
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div id='#{front['id']}' class='#{front['class']}'>#{eval(front['value']).to_s}</div>")
       else
         ret = ''
         part = PagePart.find(front['part_id']) if front['part_id']
         ret << eval("\"#{front['path']}\"") rescue ''
-        ret << (ret.include?("?") ? "&#{args.to_param}" : "?#{args.to_param}") if args.present?
+        ar = args.to_param
+        ar = URI.unescape(ar)
+        ret << (ret.include?("?") ? "&#{ar}" : "?#{ar}") if args.present?
         fragment = Nokogiri::HTML::DocumentFragment.new(body, "<div class='dymanic_load widget' path='#{ret}'></div>")
       end
       front.swap(fragment)

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/front_end/web_links_controller.rb

@@ -23,8 +23,8 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
     date_now = Time.now
 
     # @web_link_categorys = get_categories_for_index
-    if !params[:category_id].blank?
+    if !params[:filter_category_id].blank?
-      @web_link_categorys = @module_app.categories.enabled.any_in(:_id => params[:category_id])
+      @web_link_categorys = @module_app.categories.enabled.any_in(:_id => params[:filter_category_id])
     else
       @web_link_categorys = @module_app.categories.enabled
     end