jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
yanxd 2014-05-23 11:00:46 +08:00
parent e52886cf46 213939b474
commit 3ae7729539
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.rb
View File

@ -201,7 +201,7 @@ class User < Principal
#选择项目成员时显示的用户信息文字 #选择项目成员时显示的用户信息文字
def userInfo def userInfo
info=self.name + ' (' + self.login + ')'; info=self.nickname + ' (' + self.realname + ')';
end end
###添加留言 fq ###添加留言 fq
@ -369,6 +369,10 @@ class User < Principal
end end
end end
def nickname(formatter = nil)
login
end
def name(formatter = nil) def name(formatter = nil)
login login
end end

6
app/views/welcome/course.html.erb
View File

@ -102,7 +102,7 @@
<% end %> <% end %>
</span> </span>
<span class='font_bolder'> <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)%> <%#=course.try(:teacher).try(:name)%>
</span> </span>
</div> </div>
@ -154,8 +154,7 @@
<%= course.school.name.try(:gsub, /(.+)$/, '\1:') %> <%= course.school.name.try(:gsub, /(.+)$/, '\1:') %>
</span> </span>
<span class='font_bolder'> <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> </span>
</div> </div>
<div class='desc_item text_nowrap' style="width: 310px;"> <div class='desc_item text_nowrap' style="width: 310px;">
@ -199,7 +198,6 @@
</span> </span>
<span class='font_bolder'> <span class='font_bolder'>
<%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %> <%= link_to(course.try(:teacher).try(:name), user_path(course.teacher)) %>
<%#=course.try(:teacher).try(:name)%>
</span> </span>
</div> </div>
<div class='desc_item text_nowrap' style="width: 310px;"> <div class='desc_item text_nowrap' style="width: 310px;">