|
|
@ -1044,9 +1044,9 @@ module ApplicationHelper
|
|
|
|
elsif @organization
|
|
|
|
elsif @organization
|
|
|
|
title << @organization.name
|
|
|
|
title << @organization.name
|
|
|
|
elsif @user
|
|
|
|
elsif @user
|
|
|
|
title << @user.login
|
|
|
|
title << @user.try(:realname)
|
|
|
|
else
|
|
|
|
else
|
|
|
|
title << User.current.login
|
|
|
|
title << User.current.try(:realname)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
if first_page.nil? || first_page.web_title.nil?
|
|
|
|
if first_page.nil? || first_page.web_title.nil?
|
|
|
|
title << Setting.app_title unless Setting.app_title == title.last
|
|
|
|
title << Setting.app_title unless Setting.app_title == title.last
|
|
|
|