diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb index 228ce31c..8333e2c3 100644 --- a/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb +++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/front_end/bulletins/index.html.erb @@ -15,9 +15,9 @@ <%= t('announcement.bulletin.title') %> <%= t('announcement.bulletin.postdate') %> - <% if @bulletins.blank? %> + <% if @bulletins.blank? and !params[:search_query].blank? %> <%=render :partial => 'shared/search_not_found' %> - <% else %> + <% elsif !params[:search_query].blank? %> <%= t("search.result_get",:item_num=>@bulletins.count) %> <% end %> <% @bulletins.each do |post| %> diff --git a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb index dc55f48a..1073c908 100644 --- a/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb +++ b/vendor/built_in_modules/news/app/views/panel/news/front_end/news_bulletins/index.html.erb @@ -7,9 +7,9 @@ <% else %>

<%= t('news.news') %>

<% end %> - <% if @news_bulletins.blank? %> + <% if @news_bulletins.blank? and !params[:search_query].blank? %> <%=render :partial => 'shared/search_not_found' %> - <% else %> + <% elsif !params[:search_query].blank? %> <%= t("search.result_get",:item_num=>@news_bulletins.count) %> <% end %>