From 6b3882aff8853902a994b40730743fb10f252bfb Mon Sep 17 00:00:00 2001
From: zhangshenjerry <1375181337@qq.com>
Date: Fri, 24 Jul 2015 16:33:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=9A?=
 =?UTF-8?q?=E5=A6=82=E5=9B=BE=E5=80=BC=E4=B8=BA0=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E4=BA=9B=E5=AD=97=E6=AE=B5=E4=B8=8D=E8=A6=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 72 +++++++++++++++++------
 app/views/my/account.html.erb             |  1 -
 2 files changed, 54 insertions(+), 19 deletions(-)

diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index bbfe9a1ea..4b6bd2887 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -149,29 +149,65 @@
       <div class="leftbox mt10">
         <ul class="leftbox_ul_left">
           <% if !@user.user_extensions.nil? && @user.user_extensions.identity == 0 %>
-            <li>创建课程&nbsp;:</li>
-            <li>发布作业&nbsp;:</li>
+            <% if(get_create_course_count(@user)) == 0 %>
+                <li>创建课程&nbsp;:</li>
+            <% end %>
+            <% if(get_homework_commons_count(@user)) == 0 %>
+                <li>发布作业&nbsp;:</li>
+            <% end %>
+          <% end %>
+          <% if (get_join_course_count(@user) != 0) %>
+              <li>加入课程&nbsp;:</li>
+          <% end %>
+          <% if @user.user_extensions.identity == 0 %>
+            <li>参加匿评&nbsp;:</li>
+          <% end %>
+          <% if (get_projectandcourse_attachment_count(@user) != 0) %>
+              <li>发布资源&nbsp;:</li>
+          <% end %>
+          <% if (get_create_project_count(@user) != 0) %>
+              <li>创建项目&nbsp;:</li>
+          <% end %>
+          <% if (get_join_project_count(@user) != 0) %>
+              <li>加入项目&nbsp;:</li>
+          <% end %>
+          <% if (get_create_issue_count(@user) != 0) %>
+              <li>发布缺陷&nbsp;:</li>
+          <% end %>
+          <% if (get_resolve_issue_count(@user) != 0) %>
+              <li>解决缺陷&nbsp;:</li>
           <% end %>
-          <li>加入课程&nbsp;:</li>
-          <li>参加匿评&nbsp;:</li>
-          <li>发布资源&nbsp;:</li>
-          <li>创建项目&nbsp;:</li>
-          <li>加入项目&nbsp;:</li>
-          <li>发布缺陷&nbsp;:</li>
-          <li>解决缺陷&nbsp;:</li>
         </ul>
         <ul class="leftbox_ul_right c_dgrey">
           <% if !@user.user_extensions.nil? && @user.user_extensions.identity == 0 %>
-            <li><%= get_create_course_count(@user) %></li>
-            <li><%= get_homework_commons_count(@user) %></li>
+            <% if(get_create_course_count(@user)) == 0 %>
+                <li><%= get_create_course_count(@user) %></li>
+            <% end %>
+            <% if(get_homework_commons_count(@user)) == 0 %>
+                <li><%= get_homework_commons_count(@user) %></li>
+            <% end %>
+          <% end %>
+          <% if (get_join_course_count(@user) != 0) %>
+            <li><%= get_join_course_count(@user) %></li>
+          <% end %>
+          <% if @user.user_extensions.identity == 0 %>
+            <li><%= get_anonymous_evaluation_count(@user) %></li>
+          <% end %>
+          <% if (get_projectandcourse_attachment_count(@user) != 0) %>
+              <li><%= get_projectandcourse_attachment_count(@user) %></li>
+          <% end %>
+          <% if (get_create_project_count(@user) != 0) %>
+              <li><%= get_create_project_count(@user) %></li>
+          <% end %>
+          <% if (get_join_project_count(@user) != 0) %>
+              <li><%= get_join_project_count(@user) %></li>
+          <% end %>
+          <% if (get_create_issue_count(@user) != 0) %>
+              <li><%= get_create_issue_count(@user) %></li>
+          <% end %>
+          <% if (get_resolve_issue_count(@user) != 0) %>
+              <li><%= get_resolve_issue_count(@user) %></li>
           <% end %>
-          <li><%= get_join_course_count(@user) %></li>
-          <li><%= get_anonymous_evaluation_count(@user) %></li>
-          <li><%= get_projectandcourse_attachment_count(@user) %></li>
-          <li><%= get_create_project_count(@user) %></li>
-          <li><%= get_join_project_count(@user) %></li>
-          <li><%= get_create_issue_count(@user) %></li>
-          <li><%= get_resolve_issue_count(@user) %></li>
         </ul>
         <div class="cl"></div>
       </div>
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 57c3712f9..c23266afd 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -540,7 +540,6 @@
       $('#my_account_form_btn').click();
     });
     $('#my_password_form_link').click(function(){
-        alert("密码修改成功，请重新登录!");
       $('#my_password_form_btn').click();
     });
   });