alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed name method of member profile and also changed name in orbit bar

This commit is contained in:
Harry Bomrah 2014-05-26 16:48:06 +08:00
parent 791148ce1b
commit 5773a826e4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/member_profile.rb
View File

@ -23,6 +23,8 @@ class MemberProfile
paginates_per 10
def name
"#{self.first_name} #{self.last_name}"
if self.first_name || self.last_name
"#{self.first_name} #{self.last_name}"
end
end
end

2
app/views/orbit_bar/index.html.erb
View File

@ -90,7 +90,7 @@
</li>
<% if !current_user.nil? %>
<li>
<span id="user"><%= current_user.member_profile.nil? ? current_user.user_name : current_user.member_profile.name %></span>
<span id="user"><%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %></span>
<ul>
<li>
<a href="/logout"><i class="icons-logout"></i><%= t(:logout) %></a>