diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb index 3b81b661..d90a0d6d 100644 --- a/app/views/projects/_member_list.html.erb +++ b/app/views/projects/_member_list.html.erb @@ -8,11 +8,14 @@ <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar')) %> <%= content_tag "div", link_to(member.user.show_name, user_path(member.user)), :class => "nomargin avatar_name" %> - <% unless member.user.user_extensions.identity ==0 %> - - <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %> - <% end %> + <% if @project.project_type == 1 %> + <% unless member.user.user_extensions.identity ==0 %> + + <% if User.current.logged? && (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil?) %> + <%= content_tag "p", "#{l(:label_bidding_user_studentcode)}#{' : '}#{member.user.user_extensions.student_id}", :class => "nomargin avatar_name" %> + <% end %> + <% end %>
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb index bfdf2907..51a6ab09 100644 --- a/app/views/users/user_fanslist.html.erb +++ b/app/views/users/user_fanslist.html.erb @@ -10,7 +10,7 @@ :title => "#{user.name}" %>
<%= content_tag "div", link_to_user(user.show_name), :class => "project_avatar_name" %>
+ <%= content_tag "div", link_to(user.show_name,user_path(user)), :class => "project_avatar_name" %>
|
| <%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %> |
|