Merge pull request #18570 from opf/merge-release/15.5-20250408034155

Merge release/15.5 into dev

Author: ulferts

app/controllers/workflows_controller.rb

@@ -152,6 +152,6 @@ def eligible_roles
   def permitted_status_params
     params["status"]
       .to_unsafe_h
-      .select { |key, value| /\A\d+\z/.match?(key) && /\A\d+\z/.match?(value) }
+      .select { |key, value| /\A\d+\z/.match?(key) && value.keys.all? { /\A\d+\z/.match?(it) } }
   end
 end

docs/user-guide/work-packages/exporting/README.md

@@ -181,12 +181,16 @@ If you select **Generate PDF**, a modal will open, where you can adjust the foll
   - If *Attributes and description* template is selected, the project name will be suggested for the footer. This text will be placed at the center of the footer. 
   - If *Contract* template is selected, the work package subject will be suggested as the footer text. This text will be placed at the right corner of the footer.
 
-  
+- **Page orientation**, which allows selecting *Portrait* or *Landscape* layout of the pages in the PDF.  
 
 ![PDF generation modal for export of single work packages in OpenProject](openproject_user_guide_work_package_export_pdf_modal.png)
 
 Click the **Download** button to generate the PDF export. 
 
+> [!NOTE]
+>
+> Layout of the PDF export follows the [work package configuration form](../../../system-admin-guide/manage-work-packages/work-package-types/#work-package-form-configuration-enterprise-add-on) defined for specific work package types. 
+
 ![Example of a single work package PDF export in OpenProject](openproject-user-guide-single-pdf-export.png)
 
 ### Export single work package in Atom format

docs/user-guide/work-packages/exporting/openproject-user-guide-single-pdf-export.png

@@ -97,7 +97,7 @@ relationGroupClass(from.id!),
     columnId:string,
   ):void {
     const relationLabel = document.createElement('span');
-    relationLabel.classList.add('relation-row--type-label');
+    relationLabel.classList.add('relation-row--type-label', 'badge');
     relationLabel.textContent = typeLabel;
 
     jRow.find(`.${relationCellClassName}`).empty();

docs/user-guide/work-packages/exporting/openproject_user_guide_work_package_export_pdf_modal.png

@@ -34,12 +34,8 @@ body
 
 // Style the relation label
 .relation-row--type-label
-  background: white
-  padding: 2px
-  border: 1px solid var(--gray)
   border-radius: 5px
   margin-right: 5px
-  font-size: 0.7rem
 
 .relation-row--type
   @include unset-button-styles

frontend/src/app/features/work-packages/components/wp-fast-table/builders/relations/relation-row-builder.ts

@@ -245,7 +245,7 @@
   end
 
   describe "#update" do
-    let(:status_params) { { "1" => "2" } }
+    let(:status_params) { { "1" => { "2" => ["always"] } } }
     let(:service) do
       service = instance_double(Workflows::BulkUpdateService)
 

frontend/src/global_styles/content/work_packages/_table_relations.sass

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+# -- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+# ++
+
+require "spec_helper"
+
+RSpec.describe "Workflow edit" do
+  include Toasts::Expectations
+
+  let(:role) { create(:project_role) }
+  let(:type) { create(:type) }
+  let(:admin)  { create(:admin) }
+  let(:statuses) { (1..3).map { create(:status) } }
+  let!(:workflow) do
+    create(:workflow, role_id: role.id,
+                      type_id: type.id,
+                      old_status_id: statuses[0].id,
+                      new_status_id: statuses[1].id,
+                      author: false,
+                      assignee: false)
+  end
+
+  current_user { admin }
+
+  before do
+    visit url_for(controller: "/workflows", action: :edit)
+  end
+
+  it "allows adding another workflow" do
+    click_button "Edit"
+
+    check "status_#{statuses[1].id}_#{statuses[2].id}_"
+
+    click_button "Save"
+
+    expect_flash(message: "Successful update.")
+
+    expect(page)
+      .to have_field "status_#{statuses[0].id}_#{statuses[1].id}_", checked: true
+    expect(page)
+      .to have_field "status_#{statuses[1].id}_#{statuses[2].id}_", checked: true
+
+    expect(page)
+      .to have_field "status_#{statuses[0].id}_#{statuses[2].id}_", checked: false
+    expect(page)
+      .to have_field "status_#{statuses[1].id}_#{statuses[0].id}_", checked: false
+    expect(page)
+      .to have_field "status_#{statuses[2].id}_#{statuses[0].id}_", checked: false
+    expect(page)
+      .to have_field "status_#{statuses[2].id}_#{statuses[1].id}_", checked: false
+  end
+end