From d20368aa38d06c2841ee67192c4cc20309b9ea78 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 9 Oct 2015 14:33:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=86=E6=B6=88=E6=81=AF=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E7=94=B1=E4=B8=80=E8=A1=8C=E5=88=86=E8=87=B3=E4=B8=A4?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 56 +++++++++++++++----------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 84d5ec1bf..813c13509 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -2,30 +2,38 @@
<%= title_for_message(params[:type]) %>
  • @@ -40,7 +34,7 @@
    - <% if @message_alls.count >0 || @user_system_messages.count >0 %> + <% if (!@message_alls.nil? && @message_alls.count >0) || (!@user_system_messages.nil? && @user_system_messages.count >0) %> <% if params[:type].nil? || params[:type] == "unviewed" %>
    有 <%= unviewed_message(@user) %> 条未读 From 6ad1ee36e2f0b878c9eddc5739589e7aeb72179c Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Fri, 9 Oct 2015 15:56:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=86=E2=80=9C=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E2=80=9D=E7=AE=80=E5=8C=96=E4=B8=BA?= =?UTF-8?q?=E2=80=9C=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E2=80=9D=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E5=85=B6=E4=BB=96=E5=88=97=E8=A1=A8=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 25900e737..958d5cf53 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -19,7 +19,7 @@
    • <%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey" %>
    • -
    • <%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %>
    • +
    • <%= link_to "项目讨论", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey" %>
    • <%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey" %>
    • <%= link_to "用户申请", user_message_path(User.current, :type => 'apply'), :class => "resourcesGrey" %>