From 315a24556c0d8c54f6eb91d1fe17dc6dbbb1eef8 Mon Sep 17 00:00:00 2001 From: chris Date: Tue, 8 Oct 2013 16:42:20 +0800 Subject: [PATCH] Fix parser common to skip not found module_app Do not show default widget if there's no data --- app/views/default_widget/default_widget.html.erb | 15 ++++++++------- lib/parsers/parser_common.rb | 4 ++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/views/default_widget/default_widget.html.erb b/app/views/default_widget/default_widget.html.erb index 835246bd..8188b2dd 100644 --- a/app/views/default_widget/default_widget.html.erb +++ b/app/views/default_widget/default_widget.html.erb @@ -1,8 +1,9 @@ -<%= render :partial => 'shared/search_header',:locals=>{:items=>@data} %> - -<%= render @partial %> -<% if @paginate and !@data.blank? %> - <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %> -<% elsif @page_part.module_app %> - <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %> +<% if @data.present? %> + <%= render :partial => 'shared/search_header',:locals=>{:items=>@data} %> + <%= render @partial %> + <% if @paginate %> + <%= paginate @data, :param_name => :page_main, :params => {:same_page_id => @page_id} %> + <% elsif @page_part.module_app %> + <%= @page_part.module_app.get_registration.default_widget_setting.link_to_more_tag(request,params) %> + <% end %> <% end %> diff --git a/lib/parsers/parser_common.rb b/lib/parsers/parser_common.rb index 7a5310b2..e8d86989 100644 --- a/lib/parsers/parser_common.rb +++ b/lib/parsers/parser_common.rb @@ -286,8 +286,8 @@ module ParserCommon when 'default_widget' "/panel/orbit_app/widget/#{part.widget_style}?inner=true" else - raise ModuleAppError,"PagePart can't find ModuleApp" if part.module_app.nil? - "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true" + # raise ModuleAppError,"PagePart can't find ModuleApp" if part.module_app.nil? + "/panel/#{part.module_app.key}/widget/#{part.widget_path}?inner=true" rescue '' end categories_str=(!part[:category].blank? ? part[:category] : category).collect{|t| "category_id[]=#{t}"}.join('&')