meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-10 19:23:06 +00:00
Code Issues Releases Wiki Activity

Merged r21541 and r21542 to 5.0-stable (#36932).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21546 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-04-28 05:40:32 +00:00
parent f9fd7c02a0
commit 9601140fff
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/redmine/info.rb
View File

@ -20,16 +20,13 @@ module Redmine
["Mailer delivery", ActionMailer::Base.delivery_method]
].map {|info| " %-30s %s" % info}.join("\n") + "\n"
theme = Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize
unless Setting.ui_theme.blank?
theme_js = (if Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme')
' (includes JavaScript)'
else
''
end
)
theme_string = ''
theme_string += (Setting.ui_theme.blank? ? 'Default' : Setting.ui_theme.capitalize)
unless Setting.ui_theme.blank? ||
Redmine::Themes.theme(Setting.ui_theme).nil? ||
!Redmine::Themes.theme(Setting.ui_theme).javascripts.include?('theme')
theme_string += ' (includes JavaScript)'
end
theme_string = (theme + theme_js.to_s).to_s
s << "Redmine settings:\n"
s << [

7
test/unit/lib/redmine/info_test.rb
View File

@ -26,4 +26,11 @@ class Redmine::InfoTest < ActiveSupport::TestCase
assert_kind_of String, env
assert_match 'Redmine version', env
end
def test_theme_with_invalid_theme_setting
Setting.ui_theme = 'foo'
env = Redmine::Info.environment
assert_match 'Redmine theme', env
end
end