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
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
More fixes after SharePoint → Sharepoint (#20062)
Yauheni Suhakoue02c14dd7da7
diff --git a/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb b/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rbindex a56d225480b..71a8bc01232 100644--- a/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb+++ b/modules/storages/app/components/storages/admin/forms/oauth_client_form_component.rb@@ -61,9 +61,9 @@ module Storages::Admin::Formsrender(Primer::Beta::Link.new(href:, underline: true, target:)) { I18n.t("storages.instructions.one_drive.application_link_text") }end- def share_point_integration_link(target: "_blank")- href = ::OpenProject::Static::Links[:storage_docs][:share_point_oauth_application][:href]- render(Primer::Beta::Link.new(href:, underline: true, target:)) { I18n.t("storages.instructions.share_point.application_link_text") }+ def sharepoint_integration_link(target: "_blank")+ href = ::OpenProject::Static::Links[:storage_docs][:sharepoint_oauth_application][:href]+ render(Primer::Beta::Link.new(href:, underline: true, target:)) { I18n.t("storages.instructions.sharepoint.application_link_text") }enddef nextcloud_integration_link(target: "_blank")diff --git a/modules/storages/app/controllers/storages/admin/access_management_controller.rb b/modules/storages/app/controllers/storages/admin/access_management_controller.rbindex 94e27d06de9..a694915ee09 100644--- a/modules/storages/app/controllers/storages/admin/access_management_controller.rb+++ b/modules/storages/app/controllers/storages/admin/access_management_controller.rb@@ -31,7 +31,7 @@class Storages::Admin::AccessManagementController < ApplicationControllerinclude OpTurbo::ComponentStream- ALLOWED_STORAGES = %i[storages_one_drive_storage storages_share_point_storage].freeze+ ALLOWED_STORAGES = %i[storages_one_drive_storage storages_sharepoint_storage].freezelayout "admin"diff --git a/modules/storages/app/controllers/storages/admin/storages_controller.rb b/modules/storages/app/controllers/storages/admin/storages_controller.rbindex 45c8795dcca..753fc9182b0 100644--- a/modules/storages/app/controllers/storages/admin/storages_controller.rb+++ b/modules/storages/app/controllers/storages/admin/storages_controller.rb@@ -261,8 +261,8 @@ class Storages::Admin::StoragesController < ApplicationController:storages_nextcloud_storageelsif params.key?(:storages_one_drive_storage):storages_one_drive_storage- elsif params.key?(:storages_share_point_storage)- :storages_share_point_storage+ elsif params.key?(:storages_sharepoint_storage)+ :storages_sharepoint_storageelse:storages_storageenddiff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.ymlindex 44a9ade8a77..40620ddfd7d 100644--- a/modules/storages/config/locales/en.yml+++ b/modules/storages/config/locales/en.yml@@ -241,7 +241,7 @@ en:storage_audience_blank: No audience has been configured.storage_audience_description: Exchanging tokens for audience "%{audience}".storage_audience_idp: Using access token obtained by identity provider during login, regardless of audience.- storage_oauth: Nextcloud OAuth+ storage_oauth: Storage OAuthstorage_provider: Storage providertoken_exchange: Token Exchangehealth:diff --git a/modules/storages/spec/features/storages/admin/create_storage_spec.rb b/modules/storages/spec/features/storages/admin/create_storage_spec.rbindex b2b7fd3aacb..6f804752d76 100644--- a/modules/storages/spec/features/storages/admin/create_storage_spec.rb+++ b/modules/storages/spec/features/storages/admin/create_storage_spec.rb@@ -76,7 +76,7 @@ RSpec.describe "Admin Create a new file storage",expect(page).not_to have_test_selector("label-openproject_oauth_application_configured-status")# OAuth client- wait_for { page }.to have_test_selector("storage-oauth-client-label", text: "Nextcloud OAuth")+ wait_for { page }.to have_test_selector("storage-oauth-client-label", text: "Storage OAuth")expect(page).not_to have_test_selector("label-storage_oauth_client_configured-status")expect(page).to have_test_selector("storage-oauth-client-id-description",text: "Allow OpenProject to access Nextcloud data using OAuth.")diff --git a/modules/storages/spec/features/storages/admin/edit_storage_spec.rb b/modules/storages/spec/features/storages/admin/edit_storage_spec.rbindex c660ee1f930..33b28af8e9b 100644--- a/modules/storages/spec/features/storages/admin/edit_storage_spec.rb+++ b/modules/storages/spec/features/storages/admin/edit_storage_spec.rb@@ -94,7 +94,7 @@ RSpec.describe "Admin Edit File storage",text: "OAuth Client ID: #{oauth_application.uid}")# OAuth client- expect(page).to have_test_selector("storage-oauth-client-label", text: "Nextcloud OAuth")+ expect(page).to have_test_selector("storage-oauth-client-label", text: "Storage OAuth")expect(page).to have_test_selector("label-storage_oauth_client_configured-status", text: "Completed")expect(page).to have_test_selector("storage-oauth-client-id-description",text: "OAuth Client ID: #{oauth_client.client_id}")