|
|
@ -116,12 +116,25 @@
|
|
|
|
|
|
|
|
|
|
|
|
<div class="user-bottom">
|
|
|
|
<div class="user-bottom">
|
|
|
|
<% unless user.memberships.empty? %>
|
|
|
|
<% unless user.memberships.empty? %>
|
|
|
|
<%= l(:label_x_contribute_to, :count => user.memberships.count) %>
|
|
|
|
<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
|
|
|
|
<% for member in user.memberships %>
|
|
|
|
<% 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) %><%= (user.memberships.last == member) ? '' : ',' %>
|
|
|
|
<% end %>
|
|
|
|
<% end %>
|
|
|
|
<% end %>
|
|
|
|
<% end %>
|
|
|
|
<%= user.changesets.count == 0 ? '' : ",#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
|
|
|
|
|
|
|
|
|
|
|
|
<p><% unless user.memberships.empty? %>
|
|
|
|
|
|
|
|
<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
|
|
|
|
|
|
|
|
<% memberships = user.memberships.all(:conditions => cond) %>
|
|
|
|
|
|
|
|
<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
|
|
|
|
|
|
|
|
<% for member in memberships %>
|
|
|
|
|
|
|
|
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : ',' %>
|
|
|
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
<% end %>
|
|
|
|
|
|
|
|
</p>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<%= user.changesets.count == 0 ? '' : "#{l(:label_x_total_commit, :count => user.changesets.count)}" %>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
</div>
|
|
|
|
<% end -%>
|
|
|
|
<% end -%>
|
|
|
|