diff --git a/CHANGELOG.md b/CHANGELOG.md index e8bcfbc..036a67c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ applications. ## Changes +## 1.9.3 - 20232-11-27 + +- (Jon) If the app is running in production, and the `relative_url_root` excludes + `/app`, then the app name is appended to the relative_url_root of `/app` + This resolves the urls paths for the apps from the landing page, but not + for the apps themselves + ## 1.9.2 - 2023-11-23 - (Jon) Resolves locked ruby version conflict created by using the `=` for the diff --git a/app/models/lr_common_config.rb b/app/models/lr_common_config.rb index de5b756..2510ff8 100644 --- a/app/models/lr_common_config.rb +++ b/app/models/lr_common_config.rb @@ -23,8 +23,14 @@ def app_link(app_name, request) # Returns the relative url root for the app if running in a subdirectory # of the web server, or the root if it is not + # If the app is running in production, and the relative_url_root excludes + # /app, then the app name is appended to the relative_url_root of `/app` + # This resolves the urls paths for the apps from the landing page, but not + # for the apps themselves def relative_url_root - Rails.application.config.relative_url_root || '/' + root_url = Rails.application.config.relative_url_root || '/' + root_url = "/app#{root_url}" if root_url.exclude?('app') && Rails.env.production? + root_url end end end diff --git a/lib/lr_common_styles/version.rb b/lib/lr_common_styles/version.rb index f66f6fb..b3c0d35 100644 --- a/lib/lr_common_styles/version.rb +++ b/lib/lr_common_styles/version.rb @@ -3,7 +3,7 @@ module LrCommonStyles MAJOR = 1 MINOR = 9 - PATCH = 2 + PATCH = 3 SUFFIX = nil VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}#{SUFFIX && ".#{SUFFIX}"}" end