SW/redmine
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX Logo web path.
All checks were successful
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/tag Build is passing
Details

Browse Source
This commit is contained in:
Roman Vaníček
2023-03-28 23:23:56 +02:00
parent 1e3d860d7b
commit f1e28f6fc1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/uxupgrade_logo.patch
View File

@@ -1,6 +1,6 @@
--- a/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade.rb --- a/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade.rb
+++ b/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade.rb +++ b/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade.rb
@@ -41,7 +41,7 @@ module RedmineXUxUpgrade @@ -41,10 +41,10 @@ module RedmineXUxUpgrade
logo = settings.attachments.where(description: 'logo')&.last logo = settings.attachments.where(description: 'logo')&.last
redmine_x_ux_theme_path = File.join(Rails.root, 'public', 'themes', 'redminex_theme', 'images') redmine_x_ux_theme_path = File.join(Rails.root, 'public', 'themes', 'redminex_theme', 'images')
@@ -8,7 +8,11 @@
+ path_to_logo = "#{redmine_x_ux_theme_path}/logo.png" if logo + path_to_logo = "#{redmine_x_ux_theme_path}/logo.png" if logo
if path_to_logo && File.exist?(path_to_logo) if path_to_logo && File.exist?(path_to_logo)
return ActionController::Base.helpers.asset_path("#{Redmine::Utils::relative_url_root}/themes/redminex_theme/images/#{logo.disk_filename}", :plugin => '000_redmine_x_ux_upgrade') - return ActionController::Base.helpers.asset_path("#{Redmine::Utils::relative_url_root}/themes/redminex_theme/images/#{logo.disk_filename}", :plugin => '000_redmine_x_ux_upgrade')
+ return ActionController::Base.helpers.asset_path("#{Redmine::Utils::relative_url_root}/themes/redminex_theme/images/logo.png", :plugin => '000_redmine_x_ux_upgrade')
end
#default logo if not set
--- a/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade/ux_upgrade_attachments.rb --- a/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade/ux_upgrade_attachments.rb
+++ b/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade/ux_upgrade_attachments.rb +++ b/plugins/000_redmine_x_ux_upgrade/lib/redmine_x_ux_upgrade/ux_upgrade_attachments.rb
@@ -13,6 +13,7 @@ module RedmineXUxUpgrade @@ -13,6 +13,7 @@ module RedmineXUxUpgrade