Merge branch 'release/17.0' into dev

Author: oliverguenther

.github/workflows/docker-scheduled.yml

@@ -16,8 +16,8 @@ jobs:
   build-release-candidate:
     # References to release/X.Y and X.Y-rc are being
     # updated from the devkit (UpdateWorkflows step) whenever a new release branch is created
-    uses: opf/openproject/.github/workflows/docker.yml@release/16.6
+    uses: opf/openproject/.github/workflows/docker.yml@release/17.0
     with:
-      branch: release/16.6
-      tag: 16.6-rc
+      branch: release/17.0
+      tag: 17.0-rc
     secrets: inherit

config/initializers/feature_decisions.rb

@@ -60,10 +60,6 @@
                                   description: "Enables the creation and management of portfolio and program work spaces.",
                                   force_active: true
 
-OpenProject::FeatureDecisions.add :create_from_template_permissions,
-                                  description: "Enables the currently unused " \
-                                               '"Create Project, Portfolio, Program from template" permission.'
-
 OpenProject::FeatureDecisions.add :new_project_overview,
                                   description: "Enables the new project overview experience.",
                                   force_active: true

config/initializers/permissions.rb

@@ -35,43 +35,21 @@
                      { projects: %i[new create] },
                      permissible_on: :global,
                      require: :loggedin,
-                     contract_actions: { projects: %i[create] },
-                     dependencies: :add_project_from_template
+                     contract_actions: { projects: %i[create] }
 
       map.permission :add_portfolios,
                      { portfolios: %i[new create] },
                      permissible_on: :global,
                      require: :loggedin,
                      visible: -> { OpenProject::FeatureDecisions.portfolio_models_active? },
-                     contract_actions: { portfolios: %i[create] },
-                     dependencies: :add_portfolios_from_template
+                     contract_actions: { portfolios: %i[create] }
 
       map.permission :add_programs,
                      { programs: %i[new create] },
                      permissible_on: :global,
                      require: :loggedin,
                      visible: -> { OpenProject::FeatureDecisions.portfolio_models_active? },
-                     contract_actions: { programs: %i[create] },
-                     dependencies: :add_programs_from_template
-
-      map.permission :add_project_from_template,
-                     { projects: %i[new create] },
-                     permissible_on: :global,
-                     require: :loggedin,
-                     visible: -> { OpenProject::FeatureDecisions.create_from_template_permissions_active? },
-                     contract_actions: { projects: %i[create] }
-
-      map.permission :add_portfolios_from_template,
-                     { portfolios: %i[new create] },
-                     permissible_on: :global,
-                     require: :loggedin,
-                     visible: -> { OpenProject::FeatureDecisions.create_from_template_permissions_active? }
-
-      map.permission :add_programs_from_template,
-                     { programs: %i[new create] },
-                     permissible_on: :global,
-                     require: :loggedin,
-                     visible: -> { OpenProject::FeatureDecisions.create_from_template_permissions_active? }
+                     contract_actions: { programs: %i[create] }
 
       map.permission :archive_project,
                      {

config/locales/en.yml

@@ -4077,9 +4077,6 @@ en:
   permission_add_project: "Create projects"
   permission_add_portfolios: "Create portfolios"
   permission_add_programs: "Create programs"
-  permission_add_project_from_template: "Create project from template"
-  permission_add_portfolios_from_template: "Create portfolio from template"
-  permission_add_programs_from_template: "Create program from template"
   permission_add_work_package_attachments: "Add attachments"
   permission_add_work_package_attachments_explanation: "Allows adding attachments without Edit work packages permission"
   permission_add_internal_comments: "Write internal comments"
@@ -4097,6 +4094,7 @@ en:
   permission_comment_news: "Comment news"
   permission_commit_access: "Read/write access to repository (commit)"
   permission_copy_projects: "Copy projects"
+  permission_copy_projects_explanation: "In template projects, this permission has a secondary function, it allows the creation of new projects derived from the template."
   permission_copy_work_packages: "Duplicate work packages"
   permission_create_backup: "Create backups"
   permission_delete_work_package_watchers: "Delete watchers"
@@ -4730,7 +4728,9 @@ en:
               label: "Side panel"
               description: "Add all the project attributes in a section inside the right side panel in the project overview."
     project_initiation_request:
-      header_description: "OpenProject can generate a step-by-step wizard to help project managers fill out a project initiation request. You can choose which project attributes should be included and what to do with the output document."
+      header_description: >
+        OpenProject can generate a step-by-step wizard to help project managers fill out a project initiation request. 
+        You can choose which project attributes should be included and create a PDF artifact as a result.
       status:
         submitted: "%{wizard_name} has been submitted"
         submitted_description: "Click the button below to go to the work package for the submission process."

db/migrate/20251113124140_add_from_template_permissions_to_roles_with_add_permissions.rb renamed to db/migrate/20251209191935_remove_template_permissions_from_roles.rb

@@ -28,17 +28,9 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-require Rails.root.join("db/migrate/migration_utils/permission_adder")
-
-class AddFromTemplatePermissionsToRolesWithAddPermissions < ActiveRecord::Migration[8.0]
+class RemoveTemplatePermissionsFromRoles < ActiveRecord::Migration[8.0]
   def up
-    ::Migration::MigrationUtils::PermissionAdder.add(:add_project, :add_project_from_template)
-    ::Migration::MigrationUtils::PermissionAdder.add(:add_programs, :add_programs_from_template)
-    ::Migration::MigrationUtils::PermissionAdder.add(:add_portfolios, :add_portfolios_from_template)
-  end
-
-  def down
-    # Remove the permissions that were added
+    # Remove any leftover permissions that may have been previously added.
     RolePermission.delete_by(
       permission: %w(
         add_project_from_template

publiccode.yml

@@ -141,7 +141,7 @@ description:
 
       OpenProject complies with the requirements of the [BSI IT-Grundschutz](https://www.bsi.bund.de/EN/Themen/Unternehmen-und-Organisationen/Standards-und-Zertifizierung/IT-Grundschutz/it-grundschutz_node.html) and is continuously tested against the WCAG 2.1 guidelines, as demonstrated in the [audit report](https://gitlab.opencode.de/bmi/opendesk/info/-/blob/main/24.03/Barrierefreiheit/Barrierefreiheitsbericht%20-%20Komponente%20Projekte.pdf).
 
-      OpenProject is fully compatible with the [German Administrative Cloud Strategy (DVS)](https://www.cio.bund.de/Webs/CIO/EN/digital-solutions/digital-sovereignty/german-administrative-cloud-strategy/german-administrative-cloud-strategy-node.html).
+      OpenProject is fully compatible with the [German Administrative Cloud Strategy (DVS)](https://www.cio.bund.de/Webs/CIO/DE/digitale-loesungen/digitale-souveraenitaet/deutsche-verwaltungscloud-strategie/deutsche-verwaltungscloud-strategie-node.html).
 
       OpenProject is part of the open-source office and collaboration suite
       [openDesk](https://www.opendesk.eu).