From 1c92007ac675fff9b9c8642fa89e4036daabfb5b Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 28 May 2014 15:31:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=AA=E4=BA=BA=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E5=8A=A8=E6=80=81=E6=94=B9=E4=B8=BA=20=E6=98=B5?= =?UTF-8?q?=E7=A7=B0=EF=BC=88=E7=9C=9F=E5=90=8D=EF=BC=89=20=E5=BD=A2?= =?UTF-8?q?=E5=BC=8F=E6=98=BE=E7=A4=BA=EF=BC=88=E5=AF=B9=E8=AF=A5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E7=9A=84=E8=80=81=E5=B8=88=E5=8A=A9=E6=95=99=EF=BC=89?= =?UTF-8?q?=20=E4=BD=9C=E4=B8=9A=E9=87=8C=E8=80=81=E5=B8=88=E5=8A=A9?= =?UTF-8?q?=E6=95=99=E7=9C=8B=E5=88=B0=E7=9C=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 2 +- app/views/bids/_homework_list.html.erb | 4 ++-- app/views/projects/show.html.erb | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) 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 %>