From d589a1b522257979d7c3fada77a8141d5a2f95e9 Mon Sep 17 00:00:00 2001 From: "Matthew K. Fu JuYuan" Date: Fri, 27 Jul 2012 07:42:00 +0800 Subject: [PATCH] =?UTF-8?q?fix=20for=20=E6=A8=99=E9=A1=8C=E5=BE=8C?= =?UTF-8?q?=E5=8F=B0=E7=82=BA=E3=80=8C=E6=A0=A1=E5=9C=92=E6=96=B0=E8=81=9E?= =?UTF-8?q?=E3=80=8D=EF=BC=8C=E5=89=8D=E5=8F=B0=E9=A1=AF=E7=A4=BA=E7=82=BA?= =?UTF-8?q?=E3=80=8C=E6=96=B0=E8=81=9E=E3=80=8D=20=E8=A9=B2=E9=A0=81?= =?UTF-8?q?=E9=9D=A2=E7=82=BA=E5=88=97=E8=A1=A8=EF=BC=8C=E6=9C=80=E4=B8=8A?= =?UTF-8?q?=E6=96=B9=E5=8D=BB=E5=87=BA=E7=8F=BE=E3=80=8C=E6=90=9C=E5=B0=8B?= =?UTF-8?q?=E7=B5=90=E6=9E=9C=E3=80=8D=EF=BC=9F=20from=20Mr.=E5=BC=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/announcement/front_end/bulletins/index.html.erb | 4 ++-- .../views/panel/news/front_end/news_bulletins/index.html.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 %>