diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 45ebaf247..dd83f895a 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -140,7 +140,7 @@ module CoursesHelper
def is_course_teacher user,project
is_teacher = false
searchTeacherAndAssistant(project).each do |teacher|
- if user == teacher
+ if user == teacher.user
is_teacher = true
break
end
diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb
index f7db8a375..b650f2cb5 100644
--- a/app/views/bids/_homework_list.html.erb
+++ b/app/views/bids/_homework_list.html.erb
@@ -51,7 +51,7 @@
- 发布人: <%= link_to (display_id ? homework.user.realname : homework.user ), user_path(homework.user)%>
+ 发布人: <%= link_to ( is_teacher ? homework.user.realname : homework.user ), user_path(homework.user)%>
|
作业评分:
@@ -71,7 +71,7 @@
|
- <% if display_id %>
+ <% if display_id || is_teacher %>
<%= l(:label_bidding_user_studentcode) %> : <%= homework.user.user_extensions.student_id%>
<% end %>
|
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index dfe8a10b9..173fc26a4 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -18,7 +18,7 @@
<%= h(e.project) if @project.nil? || @project.id != e.project.id %>
- <%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>
+ <%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>(<%= link_to_user(e.event_author,@canShowRealName) if e.respond_to?(:event_author) %>)
<%= l(:label_new_activity) %>
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
@@ -86,7 +86,7 @@
#判断是否显示真名
if @canShowRealName
%>
- <%= link_to (h @user.try(:realname)), user_path(@user) if @user %>
+ <%= link_to (h @user.try(:name)), user_path(@user) if @user %>(<%= link_to (h @user.try(:realname)), user_path(@user) if @user %>)
<% else %>
<%= link_to (h @user.try(:name)), user_path(@user) if @user %>
<% end %>
|