pull/6827/head
Oliver Günther 8 years ago
parent 22536c49ee
commit b462005a32
No known key found for this signature in database
GPG Key ID: 88872239EB414F99
  1. 9
      lib/open_project/backlogs/engine.rb

@ -140,7 +140,7 @@ module OpenProject::Backlogs
extend_api_response(:v3, :work_packages, :work_package) do extend_api_response(:v3, :work_packages, :work_package) do
property :story_points, property :story_points,
render_nil: true, render_nil: true,
if: ->(*) { backlogs_enabled? && type && type.has_attribute?(:story_points) } if: ->(*) { backlogs_enabled? && type && type.passes_attribute_constraint?(:story_points) }
property :remaining_time, property :remaining_time,
exec_context: :decorator, exec_context: :decorator,
@ -155,7 +155,7 @@ module OpenProject::Backlogs
extend_api_response(:v3, :work_packages, :work_package_payload) do extend_api_response(:v3, :work_packages, :work_package_payload) do
property :story_points, property :story_points,
render_nil: true, render_nil: true,
if: ->(*) { backlogs_enabled? && type && type.has_attribute?(:story_points) } if: ->(*) { backlogs_enabled? && type && type.passes_attribute_constraint?(:story_points) }
property :remaining_time, property :remaining_time,
exec_context: :decorator, exec_context: :decorator,
@ -179,7 +179,7 @@ module OpenProject::Backlogs
required: false, required: false,
show_if: -> (*) { show_if: -> (*) {
represented.project && represented.project.backlogs_enabled? && represented.project && represented.project.backlogs_enabled? &&
(!represented.type || represented.type.has_attribute?(:story_points)) (!represented.type || represented.type.passes_attribute_constraint?(:story_points))
} }
schema :remaining_time, schema :remaining_time,
@ -266,8 +266,7 @@ module OpenProject::Backlogs
project.nil? || project.backlogs_enabled? project.nil? || project.backlogs_enabled?
end end
::Type.add_default_mapping(:story_points, :estimates_and_time) ::Type.add_default_mapping(:estimates_and_time, :story_points, :remaining_time)
::Type.add_default_mapping(:remaining_time, :estimates_and_time)
end end
end end
end end

Loading…
Cancel
Save