From bc9f1e5a015ec1c25f25788c368a7444c4edcfb1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 4 Jul 2014 13:59:08 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=BD=AF=E4=BB=B6=E5=88=9B?=
 =?UTF-8?q?=E5=AE=A2=E4=B8=AD=E6=AF=8F=E4=B8=AA=E7=94=A8=E6=88=B7=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?BUG=202.=E5=8E=BB=E6=8E=89=E7=94=A8=E6=88=B7=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8E=E7=9A=84=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_show.html.erb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
index 0873f271..d6fa541c 100644
--- a/app/views/users/_user_show.html.erb
+++ b/app/views/users/_user_show.html.erb
@@ -1,7 +1,6 @@
 <!-- added by bai -->
 <div class="autoscroll">
 	<% for user in @users -%>
-	<% unless user.id == 1%>
 	<!-- added by bai -->
 	<% messages_count = user.messages.count %>
 	<% messages_score = messages_count * 0.05%>
@@ -51,15 +50,12 @@
 
 		</div>
 		<div class="user-bottom">
-			<% unless user.memberships.empty? %>
 			<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
 			<% memberships = user.memberships.all(:conditions => cond) %>
 			<%= l(:label_x_contribute_to, :count => memberships.count) %>
 			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+			<%= link_to_project(member.project) %><%= (memberships.last == member) ? '' : '，' %>
 			<% end %>
-			<% end %>
-
 			<p>
 				<%# unless user.memberships.empty? %>
 				<%# cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
@@ -74,9 +70,8 @@
 				<%# end %>
 			</p>
 
-			<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
+			<%= l(:label_x_total_commit, :count => user.changesets.count) %>
 		</div>
 	</div>
 	<% end -%>
-	<% end -%>
 </div>
\ No newline at end of file