Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

Indicate that error message should be shown to instance admin

Jan Sandbrink81ad3211d489
diff --git a/modules/storages/app/controllers/storages/project_storages_controller.rb b/modules/storages/app/controllers/storages/project_storages_controller.rb
index b00bfd9903d..fba995e1c37 100644
--- a/modules/storages/app/controllers/storages/project_storages_controller.rb
+++ b/modules/storages/app/controllers/storages/project_storages_controller.rb
@@ -130,7 +130,7 @@ class Storages::ProjectStoragesController < ApplicationController
end
def show_error(message)
- flash[:error] = message
+ flash[:error] = Array(message) + [I18n.t("project_storages.open.contact_admin")]
redirect_back(fallback_location: project_path(id: @project_storage.project_id))
end
end
diff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.yml
index 4639ca847b5..ff91d283725 100644
--- a/modules/storages/config/locales/en.yml
+++ b/modules/storages/config/locales/en.yml
@@ -82,6 +82,7 @@ en:
edit_project_folder:
label: Edit project folder
open:
+ contact_admin: Please contact your administrator to resolve this error.
remote_identity_error: An unexpected error occurred while connecting to the storage.
project_folder_mode:
automatic: Automatically managed
diff --git a/modules/storages/spec/requests/project_storages_open_spec.rb b/modules/storages/spec/requests/project_storages_open_spec.rb
index c5c498b3fc2..fdb046f22f0 100644
--- a/modules/storages/spec/requests/project_storages_open_spec.rb
+++ b/modules/storages/spec/requests/project_storages_open_spec.rb
@@ -117,7 +117,10 @@ RSpec.describe "projects/:project_id/project_storages/:id/open" do
expect(last_response.headers["Location"]).to eq("http://test.host/projects/#{project.id}")
flash = Sessions::UserSession.last.data.dig("flash", "flashes")
- expect(flash["error"]).to eq("400 | Request made outside opening hours.")
+ expect(flash["error"]).to eq([
+ "400 | Request made outside opening hours.",
+ "Please contact your administrator to resolve this error."
+ ])
end
end
@@ -216,7 +219,7 @@ RSpec.describe "projects/:project_id/project_storages/:id/open" do
expect(last_response.headers["Location"]).to eq("http://test.host/projects/#{project.id}")
flash = Sessions::UserSession.last.data.dig("flash", "flashes")
- expect(flash["error"]).to eq(["Nope, sorry!"])
+ expect(flash["error"]).to eq(["Nope, sorry!", "Please contact your administrator to resolve this error."])
end
end