Skip to content

Commit

Permalink
Merge pull request #15599 from opf/feature/55035-remove-files-module-…
Browse files Browse the repository at this point in the history
…from-project-modules

[#55035] Remove Files module from project modules
  • Loading branch information
ba1ash committed May 17, 2024
2 parents 2f19591 + 8e218bf commit 0c86925
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 195 deletions.
13 changes: 8 additions & 5 deletions modules/storages/config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,18 @@ en:
errors:
too_many_elements_created_at_once: Too many elements created at once. Expected %{max} at most, got %{actual}.
external_file_storages: External file storages
permission_create_files: 'External Storage: Create files'
permission_delete_files: 'External Storage: Delete files'
permission_create_files: 'Automatically managed project folders: Create files'
permission_create_files_explanation: This permission is only available for Nextcloud storages
permission_delete_files: 'Automatically managed project folders: Delete files'
permission_delete_files_explanation: This permission is only available for Nextcloud storages
permission_header_for_project_module_storages: Automatically managed project folders
permission_manage_file_links: Manage file links
permission_manage_storages_in_project: Manage file storages in project
permission_read_files: 'External Storage: Read files'
permission_share_files: 'External Storage: Share files'
permission_read_files: 'Automatically managed project folders: Read files'
permission_share_files: 'Automatically managed project folders: Share files'
permission_share_files_explanation: This permission is only available for Nextcloud storages
permission_view_file_links: View file links
permission_write_files: 'External Storage: Write files'
permission_write_files: 'Automatically managed project folders: Write files'
project_module_storages: Files
storages:
buttons:
Expand Down
11 changes: 3 additions & 8 deletions modules/storages/lib/open_project/storages/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,9 @@ def self.permissions
"storages/project_settings/project_storage_members": %i[index] },
permissible_on: :project,
dependencies: %i[]
OpenProject::Storages::Engine.permissions.each do |p|
permission(p, {}, permissible_on: :project, dependencies: %i[])
end
end

# Dependent on work_package_tracking module
Expand All @@ -160,14 +163,6 @@ def self.permissions
contract_actions: { file_links: %i[manage] }
end

# Dependent on storages module (Disabling storages module does revoke enabled permissions).
project_module :storages,
dependencies: :work_package_tracking do
OpenProject::Storages::Engine.permissions.each do |p|
permission(p, {}, permissible_on: :project, dependencies: %i[])
end
end

menu :admin_menu,
:files,
{ controller: "/storages/admin/storages", action: :index },
Expand Down
182 changes: 0 additions & 182 deletions modules/storages/spec/features/storages_module_spec.rb

This file was deleted.

0 comments on commit 0c86925

Please sign in to comment.