Skip to content

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

[#66413] adapted item component to show score

Eric Schubertcb6370e942bf
diff --git a/app/components/admin/custom_fields/hierarchy/item_component.html.erb b/app/components/admin/custom_fields/hierarchy/item_component.html.erb
index 4a6973a1295..874b4a1fd4e 100644
--- a/app/components/admin/custom_fields/hierarchy/item_component.html.erb
+++ b/app/components/admin/custom_fields/hierarchy/item_component.html.erb
@@ -43,9 +43,10 @@ See COPYRIGHT and LICENSE files for more details.
end
end
- if model.short.present?
+ label_addition = secondary_text
+ if label_addition.present?
item_information.with_column(mr: 2) do
- render(Primer::Beta::Text.new(color: :subtle)) { short_text }
+ render(Primer::Beta::Text.new(color: :subtle)) { label_addition }
end
end
diff --git a/app/components/admin/custom_fields/hierarchy/item_component.rb b/app/components/admin/custom_fields/hierarchy/item_component.rb
index ce06a4f79d6..88619bdcc41 100644
--- a/app/components/admin/custom_fields/hierarchy/item_component.rb
+++ b/app/components/admin/custom_fields/hierarchy/item_component.rb
@@ -49,6 +49,14 @@ module Admin
"(#{model.short})"
end
+ def secondary_text
+ if model.short.present?
+ "(#{model.short})"
+ elsif model.score.present?
+ model.score.to_s
+ end
+ end
+
def show_form? = @show_edit_form || model.new_record?
def children_count
diff --git a/lib/api/v3/custom_fields/hierarchy/items_api.rb b/lib/api/v3/custom_fields/hierarchy/items_api.rb
index b10e7e29c00..f2ea2088605 100644
--- a/lib/api/v3/custom_fields/hierarchy/items_api.rb
+++ b/lib/api/v3/custom_fields/hierarchy/items_api.rb
@@ -107,8 +107,8 @@ module API
resource :items do
after_validation do
- unless @custom_field.field_format_hierarchy?
- message = "Hierarchy items do only exists for custom fields of type hierarchy."
+ unless @custom_field.hierarchical_list?
+ message = "Hierarchy items not available for custom fields of type #{@custom_field.field_format}."
raise ::API::Errors::UnprocessableContent.new(message)
end
end
diff --git a/lib/api/v3/queries/schemas/filter_dependency_representer_factory.rb b/lib/api/v3/queries/schemas/filter_dependency_representer_factory.rb
index 0d4651f2c48..7b23d0acf65 100644
--- a/lib/api/v3/queries/schemas/filter_dependency_representer_factory.rb
+++ b/lib/api/v3/queries/schemas/filter_dependency_representer_factory.rb
@@ -96,8 +96,10 @@ module API
"API::V3::Queries::Schemas::CustomOptionFilterDependencyRepresenter"
when "bool"
"API::V3::Queries::Schemas::BooleanFilterDependencyRepresenter"
- when "user", "version", "float", "hierarchy"
+ when "user", "version", "float"
"API::V3::Queries::Schemas::#{format.camelize}FilterDependencyRepresenter"
+ when "hierarchy", "scored_list"
+ "API::V3::Queries::Schemas::HierarchyFilterDependencyRepresenter"
when "string", "link"
"API::V3::Queries::Schemas::TextFilterDependencyRepresenter"
end
diff --git a/lib/api/v3/utilities/custom_field_injector.rb b/lib/api/v3/utilities/custom_field_injector.rb
index c90a77c4139..8072bce619a 100644
--- a/lib/api/v3/utilities/custom_field_injector.rb
+++ b/lib/api/v3/utilities/custom_field_injector.rb
@@ -42,23 +42,26 @@ module API
"user" => "User",
"version" => "Version",
"list" => "CustomOption",
- "hierarchy" => "CustomField::Hierarchy::Item"
+ "hierarchy" => "CustomField::Hierarchy::Item",
+ "scored_list" => "CustomField::Hierarchy::Item"
}.freeze
LINK_FORMATS = %w(list user version hierarchy).freeze
NAMESPACE_MAP = {
- "user" => ["users", "groups", "placeholder_users"],
+ "user" => %w[users groups placeholder_users],
"version" => "versions",
"list" => "custom_options",
- "hierarchy" => "custom_field_items"
+ "hierarchy" => "custom_field_items",
+ "scored_list" => "custom_field_items"
}.freeze
REPRESENTER_MAP = {
"user" => "::API::V3::Principals::PrincipalRepresenterFactory",
"version" => "::API::V3::Versions::VersionRepresenter",
"list" => "::API::V3::CustomOptions::CustomOptionRepresenter",
- "hierarchy" => "::API::V3::CustomFields::Hierarchy::HierarchyItemRepresenter"
+ "hierarchy" => "::API::V3::CustomFields::Hierarchy::HierarchyItemRepresenter",
+ "scored_list" => "::API::V3::CustomFields::Hierarchy::HierarchyItemRepresenter"
}.freeze
class << self
@@ -115,7 +118,7 @@ module API
inject_user_schema(custom_field)
when "list"
inject_list_schema(custom_field)
- when "hierarchy"
+ when "hierarchy", "scored_list"
inject_hierarchy_schema(custom_field)
else
inject_basic_schema(custom_field)
diff --git a/lib/api/v3/utilities/custom_field_injector/link_value_getter.rb b/lib/api/v3/utilities/custom_field_injector/link_value_getter.rb
index 54cc44c8924..759e11d279c 100644
--- a/lib/api/v3/utilities/custom_field_injector/link_value_getter.rb
+++ b/lib/api/v3/utilities/custom_field_injector/link_value_getter.rb
@@ -85,7 +85,7 @@ module API
derive_principal_path_method(custom_value)
when "list"
:custom_option
- when "hierarchy"
+ when "hierarchy", "scored_list"
:custom_field_item
else
custom_field.field_format