From 24a3fdc453a56bf14555dc26871aba9de4cd759e Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 20 Jul 2017 11:14:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E7=9A=84?= =?UTF-8?q?=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E5=A2=9E=E5=8A=A0=E2=80=9C?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=9C=9F=E5=AE=9E=E5=A7=93=E5=90=8D=E2=80=9D?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/my_controller.rb | 1 + app/models/user.rb | 11 ++++++++++- app/views/attachments/_activity_attach.html.erb | 2 +- app/views/courses/_act_table.html.erb | 2 +- app/views/courses/_courseList.html.erb | 2 +- app/views/courses/_course_activity_users.html.erb | 2 +- app/views/courses/_course_heroes.html.erb | 2 +- app/views/courses/_course_teacher.html.erb | 2 +- app/views/courses/_hero_table.html.erb | 2 +- app/views/courses/_history.html.erb | 6 +++--- app/views/courses/_member.html.erb | 2 +- app/views/courses/_member_all_student_list.html.erb | 2 +- app/views/courses/_member_group_student_list.html.erb | 2 +- .../courses/_member_no_group_student_list.html.erb | 2 +- app/views/courses/_member_teacher_list.html.erb | 2 +- app/views/courses/_new_member_list.html.erb | 4 ++-- app/views/courses/_search_member_list.html.erb | 2 +- app/views/courses/_show_member_act_score.html.erb | 2 +- app/views/courses/_show_member_score.html.erb | 2 +- app/views/courses/code_repeat.html.erb | 4 ++-- app/views/courses/new.html.erb | 2 +- app/views/courses/settings/_all_student_list.html.erb | 2 +- app/views/courses/settings/_change_manager.html.erb | 2 +- app/views/courses/settings/_course_member.html.erb | 2 +- .../courses/settings/_has_group_student_list.html.erb | 2 +- app/views/courses/settings/_members.html.erb | 4 ++-- .../courses/settings/_no_group_student_list.html.erb | 2 +- .../settings/_search_not_students_list.html.erb | 2 +- .../settings/_search_not_teachers_list.html.erb | 2 +- .../courses/settings/_search_teacher_list.html.erb | 2 +- app/views/courses/syllabus.html.erb | 4 ++-- .../_new_shixun_homework_list.html.erb | 2 +- app/views/layouts/_course_base_info.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_edu_course.html.erb | 2 +- app/views/my/account.html.erb | 8 ++++++-- app/views/student_work/_add_or_delete_member.html.erb | 2 +- app/views/student_work/_choose_group_member.html.erb | 10 +++++----- .../student_work/_evaluation_student_work.html.erb | 4 ++-- .../student_work/_evaluation_un_common_work.html.erb | 4 ++-- .../_evaluation_un_group_member_work.html.erb | 4 ++-- .../student_work/_evaluation_un_group_work.html.erb | 4 ++-- .../student_work/_evaluation_un_pro_work.html.erb | 4 ++-- .../student_work/_evaluation_un_shixun_work.html.erb | 2 +- app/views/student_work/_evaluation_un_work.html.erb | 8 ++++---- .../student_work/_evaluation_un_work_archive.html.erb | 6 +++--- app/views/student_work/_evaluation_work.html.erb | 2 +- .../student_work/_evaluation_work_archive.html.erb | 6 +++--- .../student_work/_group_member_search_list.html.erb | 2 +- app/views/student_work/_homework_post_brief.html.erb | 2 +- .../student_work/_homework_reply_detail.html.erb | 2 +- app/views/student_work/_jour_replay.html.erb | 2 +- app/views/student_work/_relate_projects.html.erb | 2 +- app/views/student_work/_shixun_work_show.html.erb | 4 ++-- app/views/student_work/_show.html.erb | 4 ++-- app/views/student_work/_student_work.html.erb | 4 ++-- app/views/student_work/_student_work_replies.html.erb | 2 +- app/views/student_work/_student_work_score.html.erb | 4 ++-- .../student_work/_work_attachments_status.html.erb | 2 +- app/views/student_work/change_project.js.erb | 4 ++-- app/views/student_work/edit.html.erb | 2 +- app/views/student_work/new.html.erb | 2 +- app/views/student_work/show.html.erb | 4 ++-- .../student_work_absence_penalty.html.erb | 2 +- app/views/syllabuses/_syllabus_course_list.html.erb | 2 +- app/views/syllabuses/_syllabus_homeworks.html.erb | 4 ++-- app/views/syllabuses/_syllabus_member_list.html.erb | 4 ++-- app/views/syllabuses/_syllabus_members.html.erb | 2 +- app/views/syllabuses/_syllabus_resources.html.erb | 4 ++-- app/views/syllabuses/edit.html.erb | 2 +- app/views/syllabuses/index.html.erb | 2 +- app/views/syllabuses/new.html.erb | 2 +- app/views/syllabuses/search_not_sy_member.js.erb | 8 ++++---- app/views/syllabuses/show.html.erb | 2 +- app/views/users/_comment_reply_detail.html.erb | 2 +- app/views/users/_course_attachment.html.erb | 6 +++--- app/views/users/_course_create.html.erb | 4 ++-- app/views/users/_course_homework.html.erb | 2 +- app/views/users/_homework_base_info.html.erb | 10 +++++----- app/views/users/_news_contents.html.erb | 2 +- .../20170720013004_add_show_realname_to_users.rb | 5 +++++ 81 files changed, 140 insertions(+), 121 deletions(-) create mode 100644 db/migrate/20170720013004_add_show_realname_to_users.rb diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 82056c0ed..12c53f2f9 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -195,6 +195,7 @@ class MyController < ApplicationController @user.nickname = params[:nickname] @user.lastname = params[:lastname] @user.firstname = "" + @user.show_realname = params[:show_realname] ? 0 : 1 @user.pref.attributes = params[:pref] @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') #@user.login = params[:login].strip diff --git a/app/models/user.rb b/app/models/user.rb index 1d43c477b..f04bb4b39 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -485,8 +485,17 @@ class User < Principal end def show_name + if self.show_realname + name = lastname + firstname + else + name = nickname + end + name.blank? ? login : name + end + + def show_real_name name = lastname + firstname - name.empty? || name.nil? ? login : name + name.blank? ? login : name end def show_occupation diff --git a/app/views/attachments/_activity_attach.html.erb b/app/views/attachments/_activity_attach.html.erb index 8752b8404..8baf1deb3 100644 --- a/app/views/attachments/_activity_attach.html.erb +++ b/app/views/attachments/_activity_attach.html.erb @@ -7,7 +7,7 @@ ( <%= number_to_human_size attachment.filesize %>) - <% user_name = attachment.author.show_name.empty? ? attachment.author : attachment.author.show_name %> + <% user_name = attachment.author.show_real_name.empty? ? attachment.author : attachment.author.show_real_name %> <%= link_to h(truncate(user_name, length: 15, omission: '...')),user_path(attachment.author),:class => "link-color-grey" %>, <%= format_time(attachment.created_on) %> diff --git a/app/views/courses/_act_table.html.erb b/app/views/courses/_act_table.html.erb index 93ac29a8d..2a8294951 100644 --- a/app/views/courses/_act_table.html.erb +++ b/app/views/courses/_act_table.html.erb @@ -72,7 +72,7 @@ <% @members.each do |member| %> - <%= link_to member.user.show_name, user_path(member.user), :class => 'course_class_users_st_name' %> + <%= link_to member.user.show_real_name, user_path(member.user), :class => 'course_class_users_st_name' %> <%= member.resource_num %> <%= member.message_num %> <%= member.message_reply_num %> diff --git a/app/views/courses/_courseList.html.erb b/app/views/courses/_courseList.html.erb index aa3ce1a50..cdd07a2bd 100644 --- a/app/views/courses/_courseList.html.erb +++ b/app/views/courses/_courseList.html.erb @@ -16,7 +16,7 @@
<%= link_to image_tag(url_to_avatar(sy_author), :width => "60", :height => "60", :class => "panel-warp-img mr10 fl", :alt => "用户"), user_path(sy_author), :target => '_blank' %> - <%= link_to sy_author.show_name, user_path(sy_author), :class => 'task-index-name task-hide fl', :target => '_blank' %> + <%= link_to sy_author.show_real_name, user_path(sy_author), :class => 'task-index-name task-hide fl', :target => '_blank' %>

<% if !sy_author.user_extensions.school_id.blank? && sy_author.user_extensions.school %> diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb index 6bc049ebd..c1813865d 100644 --- a/app/views/courses/_course_activity_users.html.erb +++ b/app/views/courses/_course_activity_users.html.erb @@ -15,7 +15,7 @@ <% if !total_score.nil? && total_score !=0 %>

  • <%=link_to image_tag(url_to_avatar(contributor_score.user), :width => "50", :height => "50", :class=> "rankPortrait"),user_path(contributor_score.user) %> -

    <%=link_to contributor_score.user.show_name, user_path(contributor_score.user.id), :title => contributor_score.user.show_name %>

    +

    <%=link_to contributor_score.user.show_real_name, user_path(contributor_score.user.id), :title => contributor_score.show_real_name_name %>

    <%=total_score %>

    diff --git a/app/views/courses/_course_heroes.html.erb b/app/views/courses/_course_heroes.html.erb index 60258b42f..29a229051 100644 --- a/app/views/courses/_course_heroes.html.erb +++ b/app/views/courses/_course_heroes.html.erb @@ -12,7 +12,7 @@ <% hero_homework_scores.each do |student_score| %> <% if student_score.score.to_i != 0 %>
  • <%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %> -

    <%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %>

    +

    <%=link_to student_score.user.show_real_name, user_path(student_score.user), :title => student_score.show_real_name_name %>

    <% if !(User.current.allowed_to?(:as_teacher, @course) || User.current.admin?) && User.current.id != student_score.user.id && course_has_score_open_common_homework(@course) %> <%= "**" %> diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb index dfa8c0876..7d32321fc 100644 --- a/app/views/courses/_course_teacher.html.erb +++ b/app/views/courses/_course_teacher.html.erb @@ -12,7 +12,7 @@

    <%= link_to image_tag(url_to_avatar(member.user), :width => "50", :height => "50", :style => "display:block;", :class =>'teacher_member_img'), user_path(member.user_id), :class => 'fl' ,:alt => "用户头像" %>
    - <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 mt5 mb10 link-blue db") %> + <%= link_to(member.user.show_real_name, user_path(member.user),:class => "ml10 mt5 mb10 link-blue db") %> <%= l(:label_username)%><%= member.user.login%>
    <%= format_date(member.created_on)%> diff --git a/app/views/courses/_hero_table.html.erb b/app/views/courses/_hero_table.html.erb index 9c89a78d0..db7a40972 100644 --- a/app/views/courses/_hero_table.html.erb +++ b/app/views/courses/_hero_table.html.erb @@ -69,7 +69,7 @@ <% @members.each do |member| %> <% is_hidden = boo && User.current.id != member.user_id %> - <%= link_to member.user.show_name, user_path(member.user), :class => 'course_class_users_st_name' %> + <%= link_to member.user.show_real_name, user_path(member.user), :class => 'course_class_users_st_name' %> <%= member.committed_work_num %> <%= member.un_commit_work_num %> <%= member.late_commit_work_num %> diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb index 84c5ccd2e..9ca8d3347 100644 --- a/app/views/courses/_history.html.erb +++ b/app/views/courses/_history.html.erb @@ -9,7 +9,7 @@
    - <%= link_to journal.user.show_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%> + <%= link_to journal.user.show_real_name, user_path(journal.user),:class => 'c_blue fb fl mb10 f14', :target => "_blank"%> <%= format_time(journal.created_on) %> @@ -44,12 +44,12 @@ <% ids = 'project_respond_form_'+ journal.id.to_s%> <% if reply_allow %>
    - <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => journal,:show_name => true} %> + <%= render :partial => 'words/new_respond_course', :locals => {:journal => journal, :m_reply_id => jourshow_real_name_name => true} %>
    <% end %>
    - <%= render :partial => "words/journal_reply", :locals => {:journal => journal, :show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %> + <%= render :partial => "words/journal_reply", :locals => {:journal => show_real_name:show_name => true, :allow_delete => @course && User.current.allowed_to?(:as_teacher,@course)} %>
    diff --git a/app/views/courses/_member.html.erb b/app/views/courses/_member.html.erb index 9e6abcf4f..201ce3e66 100644 --- a/app/views/courses/_member.html.erb +++ b/app/views/courses/_member.html.erb @@ -1,7 +1,7 @@ <% @members.each do |member| %>
  • <%#= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %> - <%= link_to "#{member.principal}（#{member.principal.show_name}）", user_path(member.principal), :class => "w150 linkBlue fl", :style=>"white-space: nowrap;overflow: hidden;text-overflow: ellipsis;", :title => "#{member.principal}（#{member.principal.show_name}）" %> + <%= link_to "#{member.principal}（#{member.principal.show_real_name}）", user_path(member.principal), :class => "w150 linkBlue fl", :style=>"white-space: nowrap;overflow: hidden;text-overflow: ellipsis;", :title => "#{member.principal}（#{member.princshow_real_name_name}）" %> <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), diff --git a/app/views/courses/_member_all_student_list.html.erb b/app/views/courses/_member_all_student_list.html.erb index d1fcabc43..8776df9cf 100644 --- a/app/views/courses/_member_all_student_list.html.erb +++ b/app/views/courses/_member_all_student_list.html.erb @@ -58,7 +58,7 @@ <% user = member.user %>
  • <%= index + 1 + (@page - 1) * 20 %> - <%= link_to user.show_name, user_path(user), :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> <%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> diff --git a/app/views/courses/_member_group_student_list.html.erb b/app/views/courses/_member_group_student_list.html.erb index 4e03adf6a..700a07ffa 100644 --- a/app/views/courses/_member_group_student_list.html.erb +++ b/app/views/courses/_member_group_student_list.html.erb @@ -64,7 +64,7 @@ <%= index + 1 + (@page -1) * 20 %> - <%= link_to user.show_name, user_path(user), :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> diff --git a/app/views/courses/_member_no_group_student_list.html.erb b/app/views/courses/_member_no_group_student_list.html.erb index cebd372a1..d6604947a 100644 --- a/app/views/courses/_member_no_group_student_list.html.erb +++ b/app/views/courses/_member_no_group_student_list.html.erb @@ -58,7 +58,7 @@ <% user = member.user %>
  • <%= index + 1 + (@page - 1) * 20 %> - <%= link_to user.show_name, user_path(user), :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> diff --git a/app/views/courses/_member_teacher_list.html.erb b/app/views/courses/_member_teacher_list.html.erb index 7726f9f27..cda500781 100644 --- a/app/views/courses/_member_teacher_list.html.erb +++ b/app/views/courses/_member_teacher_list.html.erb @@ -46,7 +46,7 @@ <% user = member.user %>
  • <%= index + 1 + (@page-1) * 20 %> - <%= link_to user.show_name, user_path(user), :class => '', :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :class => '', :target => '_blank' %> <%= user.login %> <%= zh_course_role(h member.roles.where("name != 'Student'").first.name) %>
    • diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index 65718af29..1871389c8 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -84,7 +84,7 @@ <%= (@page - 1) * @limit + i + 1 %> <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30", :style => "display:block;"), user_path(user), :class => 'sy_class_users_st fl mt5 mr5' ,:alt => "用户头像", :target => '_blank' %> - <%= link_to user.show_name, user_path(user), :class => 'fl sy_class_users_st_name' ,:title => "#{user.show_name}", :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :class => 'fl sy_class_users_st_name' ,:title => "#{show_real_name_name}", :target => '_blank' %> <%= user.user_real_extension.student_id %> @@ -119,7 +119,7 @@

    - <%= user.show_name %>(<%=user.login %>)
    + (<%=user.login %>)
    资源    发布数：<%= member.resource_num.nil? ? 0 : member.resource_num %>
    问答    发布数：<%= member.message_num.nil? ? 0 : member.message_num %>回复数：<%= member.message_reply_num.nil? ? 0 : member.message_reply_num %>
    通知    提交数：<%= member.news_num.nil? ? 0 : member.news_num %>留言数：<%= member.news_reply_num.nil? ? 0 : member.news_reply_num %>
    diff --git a/app/views/courses/_search_member_list.html.erb b/app/views/courses/_search_member_list.html.erb index 42196ccfa..ced819cd0 100644 --- a/app/views/courses/_search_member_list.html.erb +++ b/app/views/courses/_search_member_list.html.erb @@ -9,7 +9,7 @@ <% members.each do |mem| %>

      • - + <% student_id = mem.user.user_extensions.student_id %>
    • diff --git a/app/views/courses/_show_member_act_score.html.erb b/app/views/courses/_show_member_act_score.html.erb index 5fa4eb273..fe656e918 100644 --- a/app/views/courses/_show_member_act_score.html.erb +++ b/app/views/courses/_show_member_act_score.html.erb @@ -11,7 +11,7 @@
    <% act_score = CourseContributorScore.where("user_id = ? and course_id = ?", member.user_id, member.course_id).first %> -

    <%= member.user.show_name %> 活跃度计算

    +

    <%= member.user.show_real_name %> 活跃度计算

    <% if act_score.nil? %>
    资源发布数 x 5 = 0 x 5 = 0
    diff --git a/app/views/courses/_show_member_score.html.erb b/app/views/courses/_show_member_score.html.erb index fbb06a340..3fed27c9a 100644 --- a/app/views/courses/_show_member_score.html.erb +++ b/app/views/courses/_show_member_score.html.erb @@ -16,7 +16,7 @@
    -

    <%= @member_score.user.show_name %> 历次作业积分

    +

    <%= @member_score.user.show_real_name %> 历次作业积分

    • 作业名称得分
      • <% @member_score.homework_common_list.each_with_index do |homework_common, index| %> diff --git a/app/views/courses/code_repeat.html.erb b/app/views/courses/code_repeat.html.erb index 2107d913b..8889c6fcb 100644 --- a/app/views/courses/code_repeat.html.erb +++ b/app/views/courses/code_repeat.html.erb @@ -40,13 +40,13 @@ <%= index + 1 %> - <%= student_work.user.show_name %> + <%= student_work.user.show_real_name %> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> <%= format_time(student_work.commit_time) %> <% if student_work.simi_id.to_i > 0 && @works_hash[student_work.simi_id.to_i] %> <% simi_student_work = @works_hash[student_work.simi_id.to_i] %> - <%=simi_student_work.user.show_name%> + <%=simi_student_work.show_real_name_name%> <%= simi_student_work.user.user_extensions.nil? ? "--" : simi_student_work.user.user_extensions.student_id%> <%= format_time(simi_student_work.commit_time) %> <% if student_work.simi_value.to_i >= 90 %> diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb index bcd53e06b..387754f93 100644 --- a/app/views/courses/new.html.erb +++ b/app/views/courses/new.html.erb @@ -1,7 +1,7 @@

      - <%= link_to User.current.show_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path %> + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path %>

      新建班级 diff --git a/app/views/courses/settings/_all_student_list.html.erb b/app/views/courses/settings/_all_student_list.html.erb index 04b9b5113..9f81020e4 100644 --- a/app/views/courses/settings/_all_student_list.html.erb +++ b/app/views/courses/settings/_all_student_list.html.erb @@ -67,7 +67,7 @@ <% user = member.user %> <%= index + 1 + (@page - 1) * 20 %> - <%= link_to user.show_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5', :target => '_blank' %> + <%= link_to user.show_real_name, user_path(user), :class => 'edu-txt-w140 task-hide mt5', :target => '_blank' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> <%= member.course_group_id == 0 ? '未分班' : member.course_group.name %> diff --git a/app/views/courses/settings/_change_manager.html.erb b/app/views/courses/settings/_change_manager.html.erb index 8cc188a30..b201df8b0 100644 --- a/app/views/courses/settings/_change_manager.html.erb +++ b/app/views/courses/settings/_change_manager.html.erb @@ -19,7 +19,7 @@ <% end %> diff --git a/app/views/courses/settings/_course_member.html.erb b/app/views/courses/settings/_course_member.html.erb index b2712645e..7d41b742a 100644 --- a/app/views/courses/settings/_course_member.html.erb +++ b/app/views/courses/settings/_course_member.html.erb @@ -13,7 +13,7 @@ <%= index + 1 %> - <%= link_to member.user.show_name, user_path(member.user), :class => "pro_new_idname ml10 mr10", :title => "#{member.user.show_name}" %> + <%= link_to member.user.show_real_name, user_path(member.user), :class => "pro_new_idname ml10 mr10", :title => "#{member.show_real_name_name}" %> <%=member.user.user_extensions.student_id %> diff --git a/app/views/courses/settings/_has_group_student_list.html.erb b/app/views/courses/settings/_has_group_student_list.html.erb index 6214e3338..48710722b 100644 --- a/app/views/courses/settings/_has_group_student_list.html.erb +++ b/app/views/courses/settings/_has_group_student_list.html.erb @@ -65,7 +65,7 @@ <% user = member.user %> <%= index + 1 + (@page -1) * 20 %> - <%= link_to user.show_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> 移除 diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index 3e69fba68..98b7b0a23 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -28,7 +28,7 @@ <%= index + 1 %> - <%= link_to user.show_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> <%= user.try(:login) %> <%= zh_course_role(h teacher.roles.where("name != 'Student'").first.name) %> @@ -46,7 +46,7 @@ <%= @teacher_count + index + 1 %> - <%= link_to user.show_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> + <%= link_to show_real_name_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> <%= user.try(:login) %> <%= apply.content && apply.content.include?('9') ? "教师" : "助教" %> diff --git a/app/views/courses/settings/_no_group_student_list.html.erb b/app/views/courses/settings/_no_group_student_list.html.erb index 217a463b6..d4124f288 100644 --- a/app/views/courses/settings/_no_group_student_list.html.erb +++ b/app/views/courses/settings/_no_group_student_list.html.erb @@ -69,7 +69,7 @@ - <%= link_to user.show_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> + <%= link_to user.show_real_name, user_path(user), :target => '_blank', :class => 'edu-txt-w140 task-hide mt5' %> <%= user.login %> <%= user.user_extensions ? user.user_extensions.student_id : '' %> diff --git a/app/views/courses/settings/_search_not_students_list.html.erb b/app/views/courses/settings/_search_not_students_list.html.erb index f72e1a657..a26480599 100644 --- a/app/views/courses/settings/_search_not_students_list.html.erb +++ b/app/views/courses/settings/_search_not_students_list.html.erb @@ -6,7 +6,7 @@ diff --git a/app/views/courses/settings/_search_not_teachers_list.html.erb b/app/views/courses/settings/_search_not_teachers_list.html.erb index d526fc768..558029f1a 100644 --- a/app/views/courses/settings/_search_not_teachers_list.html.erb +++ b/app/views/courses/settings/_search_not_teachers_list.html.erb @@ -6,7 +6,7 @@ diff --git a/app/views/courses/settings/_search_teacher_list.html.erb b/app/views/courses/settings/_search_teacher_list.html.erb index bcfa8da14..f2121c08f 100644 --- a/app/views/courses/settings/_search_teacher_list.html.erb +++ b/app/views/courses/settings/_search_teacher_list.html.erb @@ -3,7 +3,7 @@ <% members.each do |mem| %>
    • - <%=mem.user.show_name %>（<%= mem.user.login %>） + <%=mem.user.show_real_name %>（<%= mem.user.login %>）
      • <% end %> <% end %> diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb index 06e790527..e37a34c31 100644 --- a/app/views/courses/syllabus.html.erb +++ b/app/views/courses/syllabus.html.erb @@ -75,7 +75,7 @@
      - <%= link_to @article.author.show_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %> + <%= link_to @article.author.show_real_name, user_path(@article.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
      <%= format_time( @article.created_on)%>
      @@ -120,7 +120,7 @@
      - <%= link_to reply.author.show_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %> + <%= link_to reply.aushow_real_name_name, user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
      <%= reply.content.html_safe%> diff --git a/app/views/homework_common/_new_shixun_homework_list.html.erb b/app/views/homework_common/_new_shixun_homework_list.html.erb index 19b58069d..a32ac44f8 100644 --- a/app/views/homework_common/_new_shixun_homework_list.html.erb +++ b/app/views/homework_common/_new_shixun_homework_list.html.erb @@ -15,7 +15,7 @@ <%= link_to shixun.name, shixun_path(shixun), :class => "edu-info-dark task-hide mt3", :target => "_blank" %> - <%= link_to shixun.owner.try(:show_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> + <%= link_to shixun.owner.try(:show_real_name), user_path(shixun.owner), :class => "edu-txt-w140 mt3 task-hide" %> <%= shixun.myshixuns.count %> <% end %> diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index ffdc2be16..72913cc07 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -43,7 +43,7 @@
    • - <%= link_to @course.teacher.show_name, user_path(@course.teacher), :class => 'edu-info-dark task-hide fl' %> + <%= link_to @course.teacher.show_real_name, user_path(@course.teacher), :class => 'edu-info-dark task-hide fl' %> <%= get_occupation_from_user(@course.teacher).blank? ? '' : get_occupation_from_user(@course.teacher) %> <%= course_teacher_link teacher_num %>教师 <%= course_student_link student_num %>学生 diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index a960fc588..6068525e9 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -55,7 +55,7 @@

      - <%= link_to User.current.show_name, user_path(User.current) %> > + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path %> > <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%> <%#= link_to @course.name, course_path(@course), :title => '班级' %> diff --git a/app/views/layouts/base_edu_course.html.erb b/app/views/layouts/base_edu_course.html.erb index e361df095..7ca1b9f8e 100644 --- a/app/views/layouts/base_edu_course.html.erb +++ b/app/views/layouts/base_edu_course.html.erb @@ -25,7 +25,7 @@ <% if @show_page %>

      - <%= link_to User.current.show_name, user_path(User.current) %> > + <%= link_to User.current.show_real_name, user_path(User.current) %> > <%= link_to '课堂教学', courses_path %> > <%= link_to @course.syllabus.title, syllabus_path(@course.syllabus), :title => '课程' %> ><%= @course.name%> <%#= link_to @course.name, course_path(@course), :title => '班级' %> diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index 2c718c0e8..c70bccef6 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -43,7 +43,9 @@

    • - + + > +
      请填写您的真实姓名
      • @@ -192,7 +194,9 @@
    • - + + > +
      请填写您的真实姓名
      • diff --git a/app/views/student_work/_add_or_delete_member.html.erb b/app/views/student_work/_add_or_delete_member.html.erb index d21a91da5..2b7846b19 100644 --- a/app/views/student_work/_add_or_delete_member.html.erb +++ b/app/views/student_work/_add_or_delete_member.html.erb @@ -23,7 +23,7 @@
          -
        • <%=User.current.show_name %> +
        • <%=User.current.show_real_name %> <% unless User.current.user_extensions.student_id == "" %> (<%=User.current.user_extensions.student_id %>) <% end %> diff --git a/app/views/student_work/_choose_group_member.html.erb b/app/views/student_work/_choose_group_member.html.erb index 419024fbf..c97218e8f 100644 --- a/app/views/student_work/_choose_group_member.html.erb +++ b/app/views/student_work/_choose_group_member.html.erb @@ -13,7 +13,7 @@
              -
            • <%=User.current.show_name %> +
            • <%=User.current.show_real_name %> <% unless User.current.user_extensions.student_id == "" %> (<%=User.current.user_extensions.student_id %>) <% end %> @@ -60,12 +60,12 @@ for(var i=0; i
            • - <%= link_to student_work.user.show_name,user_path(student_work.user),:title => student_work.user.show_name, :class => "c_blue02"%> + <%= link_to student_work.user.show_real_name,user_path(student_work.user),:title => student_work.user.show_real_name, :class => "c_blue02"%>
            • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_real_name + '的作品' : student_work.name%> <%= link_to student_work_name, student_work_path(student_work.id),:remote => true,:title => student_work.name, :class => "c_blue02"%>
            • diff --git a/app/views/student_work/_evaluation_un_common_work.html.erb b/app/views/student_work/_evaluation_un_common_work.html.erb index 324e98f73..9083fef8b 100644 --- a/app/views/student_work/_evaluation_un_common_work.html.erb +++ b/app/views/student_work/_evaluation_un_common_work.html.erb @@ -1,7 +1,7 @@ <%= (@page - 1) * @limit + index + 1 %> - <%= link_to student_work.user.show_name, user_path(student_work.user) %> + <%= link_to student_work.user.show_real_name, user_path(student_work.user) %> "> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> @@ -69,7 +69,7 @@
              -

              <%= student_work.user.show_name %>（<%= student_work.user.login %>）
              +

              <%= student_work.user.show_real_name %>（<%= student_work.user.login %>）
              最终评分：<%= student_work.final_score %> 分
              迟交扣分：<%= student_work.late_penalty %> 分
              <% if @homework.anonymous_comment == 0%> diff --git a/app/views/student_work/_evaluation_un_group_member_work.html.erb b/app/views/student_work/_evaluation_un_group_member_work.html.erb index 9a482f063..8e85951bf 100644 --- a/app/views/student_work/_evaluation_un_group_member_work.html.erb +++ b/app/views/student_work/_evaluation_un_group_member_work.html.erb @@ -6,14 +6,14 @@ <%= link_to(image_tag(url_to_avatar(st.user),:width =>"40",:height => "40", :style => "display:block;"),user_path(st.user), :class => "fl", :target => '_blank') %> <% if !is_expand %> - <%= link_to st.user.show_name + "(组长)", user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;", :target => '_blank' %> + <%= link_to st.user.show_real_name + "(组长)", user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;", :target => '_blank' %> <% else %> - <%= link_to st.user.show_name, user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;", :target => '_blank' %> + <%= link_to st.user.show_real_name, user_path(st.user), :class => "fl hidden ml5 linkGrey", :style => "max-width:75px;", :target => '_blank' %>

              -

              <%= student_work.user.show_name %>（<%= student_work.user.login %>）
              +

              <%= student_work.user.show_real_name %>（<%= student_work.user.login %>）
              最终评分：<%= student_work.final_score %> 分
              迟交扣分：<%= student_work.late_penalty %> 分
              <% if @homework.anonymous_comment == 0%> diff --git a/app/views/student_work/_evaluation_un_pro_work.html.erb b/app/views/student_work/_evaluation_un_pro_work.html.erb index 7b79c091d..d891e3da2 100644 --- a/app/views/student_work/_evaluation_un_pro_work.html.erb +++ b/app/views/student_work/_evaluation_un_pro_work.html.erb @@ -1,7 +1,7 @@ <%= (@page - 1) * @limit + index + 1 %> - <%= link_to student_work.user.show_name, user_path(student_work.user) %> + <%= link_to student_work.user.show_real_name, user_path(student_work.user) %> "> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> @@ -72,7 +72,7 @@

              -

              <%= student_work.user.show_name %>（<%= student_work.user.login %>）
              +

              <%= student_work.user.show_real_name %>（<%= student_work.user.login %>）
              最终评分：<%= student_work.final_score %> 分
              迟交扣分：<%= student_work.late_penalty %> 分
              <% if @homework.anonymous_comment == 0%> diff --git a/app/views/student_work/_evaluation_un_shixun_work.html.erb b/app/views/student_work/_evaluation_un_shixun_work.html.erb index 881463a0b..9423f400c 100644 --- a/app/views/student_work/_evaluation_un_shixun_work.html.erb +++ b/app/views/student_work/_evaluation_un_shixun_work.html.erb @@ -1,7 +1,7 @@ <%= (@page - 1) * @limit + index + 1 %> - <%= link_to student_work.user.show_name, user_path(student_work.user) %> + <%= link_to student_work.user.show_real_name, user_path(student_work.user) %> "> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id %> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 56a5d2d99..f5b3f85df 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -12,8 +12,8 @@ <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_path(student_work.user), :target => '_blank') %> <% if @homework.homework_type != 3 %> - - <%= link_to student_work.user.show_name ,user_path(student_work.user), :target => '_blank' %> + + <%= link_to student_work.user.show_real_name ,user_path(student_work.user), :target => '_blank' %> " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> @@ -22,7 +22,7 @@ <% if @homework.homework_detail_group.base_on_project == 1 %>

              - <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word"%> + <%= link_to student_work.user.show_real_name,"javascript:void(0)" ,:title => student_work.user.show_real_name, :class => "StudentName break_word"%>
              <% if student_work.project_id == 0 || student_work.project_id.nil?%> @@ -41,7 +41,7 @@ <% elsif @homework.homework_detail_group.base_on_project == 0 %>
              - <%= link_to student_work.user.show_name,"javascript:void(0)" ,:title => student_work.user.show_name, :class => "StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> + <%= link_to student_work.user.show_real_name,"javascript:void(0)" ,:title => student_work.user.show_real_name, :class => "StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
              <% end %> diff --git a/app/views/student_work/_evaluation_un_work_archive.html.erb b/app/views/student_work/_evaluation_un_work_archive.html.erb index af4655356..1432c57b8 100644 --- a/app/views/student_work/_evaluation_un_work_archive.html.erb +++ b/app/views/student_work/_evaluation_un_work_archive.html.erb @@ -6,14 +6,14 @@
            • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_real_name + '的作品' : student_work.name%>
              <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%>
              • <% if @homework.homework_type != 3 %> -
            • - <%= student_work.user.show_name%> +
            • + <%= student_work.user.show_real_name%>
            • " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index 83da78e18..39bc70a81 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -9,7 +9,7 @@ <% if is_my_work%> <%= index + 1 %> - <%= student_work.user.show_name%> + <%= student_work.user.show_real_name%> <%= format_time student_work.updated_at %> <%= student_work.student_score.nil? ? '--' : format("%.1f",student_work.student_score)+"（#{student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count}）" %> diff --git a/app/views/student_work/_evaluation_work_archive.html.erb b/app/views/student_work/_evaluation_work_archive.html.erb index ee415f52c..6332194b6 100644 --- a/app/views/student_work/_evaluation_work_archive.html.erb +++ b/app/views/student_work/_evaluation_work_archive.html.erb @@ -13,14 +13,14 @@
            • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_real_name + '的作品' : student_work.name%> <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%>
              • <% if @homework.homework_type != 3 %> -
            • - <%= student_work.user.show_name%> +
            • + <%= student_work.user.show_real_name%>
            • " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;"> <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> diff --git a/app/views/student_work/_group_member_search_list.html.erb b/app/views/student_work/_group_member_search_list.html.erb index 7a2ae821c..4a0affb61 100644 --- a/app/views/student_work/_group_member_search_list.html.erb +++ b/app/views/student_work/_group_member_search_list.html.erb @@ -3,7 +3,7 @@ <% @users.each do |user| %> - <%= user.show_name %> + <%= user.show_real_name %> <%= user.user_extensions.try(:student_id) %> <%= @course.members.where(:user_id => user.id).first.course_group.try(:name) %> diff --git a/app/views/student_work/_homework_post_brief.html.erb b/app/views/student_work/_homework_post_brief.html.erb index 27c5c8444..40e889831 100644 --- a/app/views/student_work/_homework_post_brief.html.erb +++ b/app/views/student_work/_homework_post_brief.html.erb @@ -3,7 +3,7 @@
              • - <%= link_to homework.user.show_name, user_activities_path(homework.user_id), :class => "newsBlue mr15"%> + <%= link_to homework.user.show_real_name, user_activities_path(homework.user_id), :class => "newsBlue mr15"%>
              <% index = get_hw_index(homework, is_teacher) %> diff --git a/app/views/student_work/_homework_reply_detail.html.erb b/app/views/student_work/_homework_reply_detail.html.erb index 5c742ffdc..5a6b8ece6 100644 --- a/app/views/student_work/_homework_reply_detail.html.erb +++ b/app/views/student_work/_homework_reply_detail.html.erb @@ -9,7 +9,7 @@
              - <%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username hide fl" %> + <%= link_to comment.creator_user.show_real_name, user_path(comment.creator_user), :class => "content-username hide fl" %> <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
              <%= comment.content_detail.html_safe %> diff --git a/app/views/student_work/_jour_replay.html.erb b/app/views/student_work/_jour_replay.html.erb index 1887614fb..ec1a886c6 100644 --- a/app/views/student_work/_jour_replay.html.erb +++ b/app/views/student_work/_jour_replay.html.erb @@ -2,7 +2,7 @@ <%= link_to image_tag(url_to_avatar(show_real_name ? jour.user : ""), :width => "32", :height => "32"), show_real_name ? user_path(jour.user) : "javascript:void(0)",:class => "st_img fl" %>
              - <%= link_to show_real_name ? jour.user.show_name : "匿名", show_real_name ? user_path(jour.user) : "javascript:void(0)", :title => jour.user.show_name, :class => "c_blue fl" %> + <%= link_to show_real_name ? jour.user.show_real_name : "匿名", show_real_name ? user_path(jour.user) : "javascript:void(0)", :title => jour.user.show_real_name, :class => "c_blue fl" %> <% if jour.user==User.current || User.current.admin? %> <%= link_to(l(:label_bid_respond_delete), destroy_score_reply_student_work_index_path(:jour_id => jour.id), diff --git a/app/views/student_work/_relate_projects.html.erb b/app/views/student_work/_relate_projects.html.erb index 8a1382386..818f759cc 100644 --- a/app/views/student_work/_relate_projects.html.erb +++ b/app/views/student_work/_relate_projects.html.erb @@ -18,7 +18,7 @@ <% if is_change %> 更换项目 <% end %> - <%=link_to "".html_safe, user_path(projectUser), :title => "#{projectUser.show_name}" %> + <%=link_to "".html_safe, user_path(projectUser), :title => "#{projectUser.show_real_name}" %>
              diff --git a/app/views/student_work/_shixun_work_show.html.erb b/app/views/student_work/_shixun_work_show.html.erb index 9b9f58352..961683f78 100644 --- a/app/views/student_work/_shixun_work_show.html.erb +++ b/app/views/student_work/_shixun_work_show.html.erb @@ -6,7 +6,7 @@

              - <%= link_to @shixun.owner.try(:show_name), user_path(@shixun.owner), :class => "link-name-dark fl", :target => "_blank" %> + <%= link_to @shixun.owner.try(:show_real_name), user_path(@shixun.owner), :class => "link-name-dark fl", :target => "_blank" %> / <%= link_to @shixun.name, shixun_path(@shixun), :class => "edu-info-dark fl", :target => "_blank" %>

              @@ -16,7 +16,7 @@ <%= link_to image_tag(url_to_avatar(@work.user), :width =>"50", :height => "50", :alt=>"头像", :style => "width:50px; height:50px;"), user_path(@work.user), :class => "fl edu-work-user-img", :target => "_blank" %>