diff options
| author | Marius Balteanu <marius.balteanu@zitec.com> | 2022-04-28 05:40:32 +0000 |
|---|---|---|
| committer | Marius Balteanu <marius.balteanu@zitec.com> | 2022-04-28 05:40:32 +0000 |
| commit | 9601140fff74745e8cebec30acace5c909bb8953 (patch) | |
| tree | bc797e6b0aa99a0ee137cf66349bb3fe8cb49b94 | |
| parent | f9fd7c02a0182391f157b32a07eacd0a7e866ee8 (diff) | |
| download | redmine-9601140fff74745e8cebec30acace5c909bb8953.tar.gz redmine-9601140fff74745e8cebec30acace5c909bb8953.zip | |
Merged r21541 and r21542 to 5.0-stable (#36932).
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21546 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/info.rb | 15 | ||||
| -rw-r--r-- | test/unit/lib/redmine/info_test.rb | 7 |
2 files changed, 13 insertions, 9 deletions
diff --git a/lib/redmine/info.rb b/lib/redmine/info.rb index 60d682c77..1933a1cda 100644 --- a/lib/redmine/info.rb +++ b/lib/redmine/info.rb @@ -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 << [ diff --git a/test/unit/lib/redmine/info_test.rb b/test/unit/lib/redmine/info_test.rb index 8b7016cd8..d83c60639 100644 --- a/test/unit/lib/redmine/info_test.rb +++ b/test/unit/lib/redmine/info_test.rb @@ -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 |