+ <%= tag.div(
+ class: "type-form-configuration-page--active-list",
+ data: active_list_data
+ ) do %>
<%= render(EnterpriseEdition::BannerComponent.new(:edit_attribute_groups, mb: 3)) %>
<% unless ee_available? %>
@@ -58,7 +61,7 @@ See COPYRIGHT and LICENSE files for more details.
ee_available: ee_available?
)
) %>
-
+ <% end %>
<% end %>
<% end %>
<% end %>
diff --git a/app/components/work_package_types/form_configuration_component.rb b/app/components/work_package_types/form_configuration_component.rb
index 1d55de92325..42e0bc29a51 100644
--- a/app/components/work_package_types/form_configuration_component.rb
+++ b/app/components/work_package_types/form_configuration_component.rb
@@ -55,6 +55,15 @@ module WorkPackageTypes
}
end
+ def active_list_data
+ {
+ controller: "admin--type-form-configuration--drag-and-drop",
+ "admin--type-form-configuration--drag-and-drop-handle-selector-value": ".group-handle",
+ "admin--type-form-configuration--drag-and-drop-target": "scrollContainer",
+ "admin--type-form-configuration--rows-drag-and-drop-target": "scrollContainer"
+ }
+ end
+
def group_components
@groups.map.with_index do |group, i|
WorkPackageTypes::FormConfiguration::GroupComponent.new(
diff --git a/app/components/work_packages/admin/settings/identifier_autofix_row_component.rb b/app/components/work_packages/admin/settings/identifier_autofix_row_component.rb
new file mode 100644
index 00000000000..2cca49038bb
--- /dev/null
+++ b/app/components/work_packages/admin/settings/identifier_autofix_row_component.rb
@@ -0,0 +1,70 @@
+# 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.
+#++
+
+module WorkPackages
+ module Admin
+ module Settings
+ class IdentifierAutofixRowComponent < OpPrimer::BorderBoxRowComponent
+ def project
+ render(Primer::Beta::Link.new(href: project_path(model[:project]))) { model[:project].name }
+ end
+
+ def previous_identifier
+ flex_layout(direction: :column) do |col|
+ col.with_row { render(Primer::Beta::Text.new) { model[:current_identifier] } }
+ if (label = error_label).present?
+ col.with_row do
+ render(Primer::OpenProject::InlineMessage.new(scheme: :critical, size: :small)) { label }
+ end
+ end
+ end
+ end
+
+ def autofixed_suggestion
+ model[:suggested_identifier]
+ end
+
+ # The sequence number is derived deterministically from the identifier so it looks
+ # varied across projects but is stable across renders. Range: 1–500.
+ def example_work_package_id
+ identifier = model[:suggested_identifier]
+ "#{identifier}-#{(identifier.bytes.sum % 500) + 1}"
+ end
+
+ private
+
+ def error_label
+ I18n.t("admin.settings.work_packages_identifier.autofix_preview.error_#{model[:error_reason]}",
+ default: "")
+ end
+ end
+ end
+ end
+end
diff --git a/app/components/work_packages/admin/settings/identifier_autofix_section_component.html.erb b/app/components/work_packages/admin/settings/identifier_autofix_section_component.html.erb
index a9ba02a0445..3386b800f4c 100644
--- a/app/components/work_packages/admin/settings/identifier_autofix_section_component.html.erb
+++ b/app/components/work_packages/admin/settings/identifier_autofix_section_component.html.erb
@@ -38,72 +38,11 @@
end
%>
-<%=
- render(border_box_container(mb: 3)) do |component|
- component.with_header(font_weight: :bold) do
- flex_layout do |header|
- header.with_column(flex: 1) do
- render(Primer::Beta::Text.new(font_weight: :semibold)) do
- I18n.t("admin.settings.work_packages_identifier.box_header.label_project")
- end
- end
- header.with_column(flex: 1) do
- render(Primer::Beta::Text.new(font_weight: :semibold)) do
- I18n.t("admin.settings.work_packages_identifier.box_header.label_previous_identifier")
- end
- end
- header.with_column(flex: 1) do
- render(Primer::Beta::Text.new(font_weight: :semibold)) do
- I18n.t("admin.settings.work_packages_identifier.box_header.label_autofixed_suggestion")
- end
- end
- header.with_column(flex: 1) do
- render(Primer::Beta::Text.new(font_weight: :semibold)) do
- I18n.t("admin.settings.work_packages_identifier.box_header.label_example_work_package_id")
- end
- end
- end
- end
-
- displayed.each do |entry|
- component.with_row do
- flex_layout(align_items: :center) do |row|
- row.with_column(flex: 1) do
- render(Primer::Beta::Link.new(href: project_path(entry[:project]))) do
- entry[:project].name
- end
- end
- row.with_column(flex: 1) do
- flex_layout(direction: :column) do |col|
- col.with_row do
- render(Primer::Beta::Text.new) { entry[:current_identifier] }
- end
- col.with_row do
- render(Primer::Beta::Text.new(color: :danger, font_size: :small)) do
- error_label(entry[:error_reason])
- end
- end
- end
- end
- row.with_column(flex: 1) do
- render(Primer::Beta::Text.new) { entry[:suggested_identifier] }
- end
- row.with_column(flex: 1) do
- render(Primer::Beta::Text.new) { sample_wp_id(entry[:suggested_identifier]) }
- end
- end
- end
- end
-
- if remaining_count.positive?
- component.with_row do
- render(Primer::Beta::Text.new(color: :muted)) do
- I18n.t(
- "admin.settings.work_packages_identifier.autofix_preview.remaining_projects",
- count: remaining_count
- )
- end
- end
- end
- end
-%>
+<%= render(Primer::Box.new(mb: 3)) do %>
+ <%= render(
+ WorkPackages::Admin::Settings::IdentifierAutofixTableComponent.new(
+ rows: displayed,
+ remaining_count:
+ )
+ ) %>
+<% end %>
diff --git a/app/components/work_packages/admin/settings/identifier_autofix_section_component.rb b/app/components/work_packages/admin/settings/identifier_autofix_section_component.rb
index 7ca1d1acc62..8dbeea1b6d6 100644
--- a/app/components/work_packages/admin/settings/identifier_autofix_section_component.rb
+++ b/app/components/work_packages/admin/settings/identifier_autofix_section_component.rb
@@ -32,8 +32,6 @@ module WorkPackages
module Admin
module Settings
class IdentifierAutofixSectionComponent < ApplicationComponent
- include OpPrimer::ComponentHelpers
-
DISPLAY_COUNT = ProjectIdentifiers::IdentifierAutofix::PreviewQuery::DISPLAY_COUNT
def initialize(projects_data:, total_count: projects_data.size)
@@ -46,19 +44,6 @@ module WorkPackages
private
attr_reader :total_count, :displayed, :remaining_count
-
- def error_label(error_reason)
- I18n.t("admin.settings.work_packages_identifier.autofix_preview.error_#{error_reason}",
- default: "")
- end
-
- # Produces a realistic-looking example work package ID for the preview table.
- # The sequence number is derived deterministically from the identifier so it looks
- # varied across projects but is stable across renders. Range: 1–500.
- def sample_wp_id(identifier)
- n = (identifier.bytes.sum % 500) + 1
- "#{identifier}-#{n}"
- end
end
end
end
diff --git a/app/components/work_packages/admin/settings/identifier_autofix_table_component.rb b/app/components/work_packages/admin/settings/identifier_autofix_table_component.rb
new file mode 100644
index 00000000000..d912f24f5ec
--- /dev/null
+++ b/app/components/work_packages/admin/settings/identifier_autofix_table_component.rb
@@ -0,0 +1,80 @@
+# 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.
+#++
+
+module WorkPackages
+ module Admin
+ module Settings
+ class IdentifierAutofixTableComponent < OpPrimer::BorderBoxTableComponent
+ columns :project, :previous_identifier, :autofixed_suggestion, :example_work_package_id
+ # Project and previous identifier hold the long content; spanning two grid columns lets
+ # them wrap instead of truncating, while the short handle columns stay compact.
+ main_column :project, :previous_identifier
+ mobile_labels :previous_identifier, :autofixed_suggestion, :example_work_package_id
+
+ def initialize(rows:, remaining_count: 0, **)
+ super(rows:, **)
+ @remaining_count = remaining_count
+ end
+
+ def row_class
+ IdentifierAutofixRowComponent
+ end
+
+ def mobile_title
+ header(:table_title)
+ end
+
+ def headers
+ [
+ [:project, { caption: header(:label_project) }],
+ [:previous_identifier, { caption: header(:label_previous_identifier) }],
+ [:autofixed_suggestion, { caption: header(:label_autofixed_suggestion) }],
+ [:example_work_package_id, { caption: header(:label_example_work_package_id) }]
+ ]
+ end
+
+ def has_footer?
+ @remaining_count.positive?
+ end
+
+ def footer
+ I18n.t("admin.settings.work_packages_identifier.autofix_preview.remaining_projects",
+ count: @remaining_count)
+ end
+
+ private
+
+ def header(key)
+ I18n.t("admin.settings.work_packages_identifier.box_header.#{key}")
+ end
+ end
+ end
+ end
+end
diff --git a/app/controllers/concerns/work_packages/with_split_view.rb b/app/controllers/concerns/work_packages/with_split_view.rb
index d9548d45310..db35f854deb 100644
--- a/app/controllers/concerns/work_packages/with_split_view.rb
+++ b/app/controllers/concerns/work_packages/with_split_view.rb
@@ -35,9 +35,5 @@ module WorkPackages
included do
helper_method :split_view_base_route
end
-
- def split_view_work_package_id
- params[:work_package_id].to_i
- end
end
end
diff --git a/app/controllers/work_packages/bulk_controller.rb b/app/controllers/work_packages/bulk_controller.rb
index 2393cff6737..44a3627701f 100644
--- a/app/controllers/work_packages/bulk_controller.rb
+++ b/app/controllers/work_packages/bulk_controller.rb
@@ -130,9 +130,20 @@ class WorkPackages::BulkController < ApplicationController
attributes = permitted_params.update_work_package
attributes[:custom_field_values] = transform_attributes(attributes[:custom_field_values])
+ attributes = attributes_with_normalized_parent_id(attributes)
transform_attributes(attributes)
end
+ def attributes_with_normalized_parent_id(attributes)
+ raw = attributes[:parent_id]
+ return attributes unless WorkPackage::SemanticIdentifier.semantic_id?(raw.to_s)
+
+ wp = WorkPackage.find_by_display_id(raw)
+ # If the semantic ID hasn't resolved to a proper package, default to 0, which is an invalid value
+ # that will trigger errors in the main update service
+ attributes.merge(parent_id: wp ? wp.id : 0)
+ end
+
def user
current_user
end
diff --git a/app/mailers/sharing_mailer.rb b/app/mailers/sharing_mailer.rb
index af5f409d15c..ca9dbbb9df2 100644
--- a/app/mailers/sharing_mailer.rb
+++ b/app/mailers/sharing_mailer.rb
@@ -40,8 +40,7 @@ class SharingMailer < ApplicationMailer
@work_package = membership.entity
role = membership.roles.first
- @url = optionally_activated_url(work_package_url(@work_package.id), @invitation_token)
- @notification_url = optionally_activated_url(details_notifications_url(@work_package.id, tab: :activity), @invitation_token)
+ @url = optionally_activated_url(work_package_url(@work_package), @invitation_token)
set_open_project_headers(@work_package)
message_id(membership, sharer)
diff --git a/app/views/mailer/_notification_row.html.erb b/app/views/mailer/_notification_row.html.erb
index 66ba12de800..f61719552f1 100644
--- a/app/views/mailer/_notification_row.html.erb
+++ b/app/views/mailer/_notification_row.html.erb
@@ -1,5 +1,5 @@
<%= render layout: "mailer/border_table" do %>