diff --git a/app/views/shared/_settings_nav.html.erb b/app/views/shared/_settings_nav.html.erb index 8e26a8fb..ca074009 100644 --- a/app/views/shared/_settings_nav.html.erb +++ b/app/views/shared/_settings_nav.html.erb @@ -135,7 +135,7 @@ <%= Docuseal::SUPPORT_EMAIL %> - <% if Docuseal.version.present? %> + <% if Docuseal.version.present? && !Docuseal.multitenant? && can?(:manage, EncryptedConfig) %> v<%= Docuseal.version %> diff --git a/lib/docuseal.rb b/lib/docuseal.rb index 578d1fcc..7bba653c 100644 --- a/lib/docuseal.rb +++ b/lib/docuseal.rb @@ -39,6 +39,7 @@ module Docuseal CERTS = JSON.parse(ENV.fetch('CERTS', '{}')) TIMESERVER_URL = ENV.fetch('TIMESERVER_URL', nil) VERSION_FILE_PATH = Rails.root.join('.version') + VERSION_FILE2_PATH = Rails.public_path.join('version') DEFAULT_URL_OPTIONS = { host: HOST, @@ -48,7 +49,12 @@ module Docuseal module_function def version - @version ||= VERSION_FILE_PATH.read.strip if VERSION_FILE_PATH.exist? + @version ||= + if VERSION_FILE_PATH.exist? + VERSION_FILE_PATH.read.strip + elsif VERSION_FILE2_PATH.exist? + VERSION_FILE2_PATH.each_line.first.to_s.strip + end end def multitenant?