Merge branch 'szzh' into develop
This commit is contained in:
commit
3ae7729539
|
@ -201,7 +201,7 @@ class User < Principal
|
|||
|
||||
#选择项目成员时显示的用户信息文字
|
||||
def userInfo
|
||||
info=self.name + ' (' + self.login + ')';
|
||||
info=self.nickname + ' (' + self.realname + ')';
|
||||
end
|
||||
|
||||
###添加留言 fq
|
||||
|
@ -369,6 +369,10 @@ class User < Principal
|
|||
end
|
||||
end
|
||||
|
||||
def nickname(formatter = nil)
|
||||
login
|
||||
end
|
||||
|
||||
def name(formatter = nil)
|
||||
login
|
||||
end
|
||||
|
|
|
@ -102,7 +102,7 @@
|
|||
<% end %>
|
||||
</span>
|
||||
<span class='font_bolder'>
|
||||
<%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
|
||||
<%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
|
||||
<%#=course.try(:teacher).try(:name)%>
|
||||
</span>
|
||||
</div>
|
||||
|
@ -154,8 +154,7 @@
|
|||
<%= course.school.name.try(:gsub, /(.+)$/, '\1:') %>
|
||||
</span>
|
||||
<span class='font_bolder'>
|
||||
<%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
|
||||
<%#=course.try(:teacher).try(:name)%>
|
||||
<%= link_to(course.try(:teacher).try(:realname), user_path(course.teacher)) %>
|
||||
</span>
|
||||
</div>
|
||||
<div class='desc_item text_nowrap' style="width: 310px;">
|
||||
|
@ -199,7 +198,6 @@
|
|||
</span>
|
||||
<span class='font_bolder'>
|
||||
<%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
|
||||
<%#=course.try(:teacher).try(:name)%>
|
||||
</span>
|
||||
</div>
|
||||
<div class='desc_item text_nowrap' style="width: 310px;">
|
||||
|
|
Loading…
Reference in New Issue