Moved the project name after the item in the html title (#9593).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7842 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a2c252f834dc2f5d41851d13968a33d417556581..aa37ff377023895d59e1fe99d5c448c4f2633de6 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -437,10 +437,9 @@ module ApplicationHelper
 
   def html_title(*args)
     if args.empty?
-      title = []
+      title = @html_title || []
       title << @project.name if @project
-      title += @html_title if @html_title
-      title << Setting.app_title
+      title << Setting.app_title unless Setting.app_title == title.last
       title.select {|t| !t.blank? }.join(' - ')
     else
       @html_title ||= []

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index b17e2aabe4f1480ae76809a8331812fda56a59b1..0b73c255dc6592bd58e19355be4f01cfbc8b0db8 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -480,6 +480,8 @@ class IssuesControllerTest < ActionController::TestCase
                :descendant => { :tag => 'fieldset',
                                 :child => { :tag => 'legend',
                                             :content => /Notes/ } }
+    assert_tag :tag => 'title',
+      :content => "Bug #1: Can't print recipes - eCookbook - Redmine"
   end
 
   def test_show_by_manager