FreakU
/
Retrospring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.rrerr.net:nilsding/justask

This commit is contained in:
pixeldesu 2014-11-13 19:37:20 +01:00
parent 9a3e6bb51b 5bb879ae7c
commit 56d7273af6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/application_helper.rb
View File

@ -35,7 +35,6 @@ module ApplicationHelper
def inbox_count def inbox_count
return 0 unless user_signed_in? return 0 unless user_signed_in?
puts current_user.id
count = Inbox.select("COUNT(id) AS count") count = Inbox.select("COUNT(id) AS count")
.where(new: true) .where(new: true)
.where(user_id: current_user.id) .where(user_id: current_user.id)

2
app/helpers/user_helper.rb
View File

@ -4,7 +4,7 @@ module UserHelper
def user_screen_name(user, anonymous=false, url=true) def user_screen_name(user, anonymous=false, url=true)
return APP_CONFIG['anonymous_name'] if user.nil? || anonymous return APP_CONFIG['anonymous_name'] if user.nil? || anonymous
name = user.display_name.blank? ? user.screen_name : user.display_name name = user.display_name.blank? ? user.screen_name : user.display_name
return link_to(name, show_user_profile_path(current_user.screen_name)) if url return link_to(name, show_user_profile_path(user.screen_name)) if url
name name
end end
end end