diff options
Diffstat (limited to 'app/services/issuable_base_service.rb')
| -rw-r--r-- | app/services/issuable_base_service.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index ecf10cf97a8..95093b88155 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -162,6 +162,8 @@ class IssuableBaseService < ::BaseProjectService return unless result.success? && result.payload.present? + @escalation_status_change_reason = result[:escalation_status].delete(:status_change_reason) + params[:incident_management_issuable_escalation_status_attributes] = result[:escalation_status] end @@ -492,11 +494,12 @@ class IssuableBaseService < ::BaseProjectService def handle_move_between_ids(issuable_position) return unless params[:move_between_ids] - after_id, before_id = params.delete(:move_between_ids) - positioning_scope_id = params.delete(positioning_scope_key) + before_id, after_id = params.delete(:move_between_ids) + + positioning_scope = issuable_position.class.relative_positioning_query_base(issuable_position) - issuable_before = issuable_for_positioning(before_id, positioning_scope_id) - issuable_after = issuable_for_positioning(after_id, positioning_scope_id) + issuable_before = issuable_for_positioning(before_id, positioning_scope) + issuable_after = issuable_for_positioning(after_id, positioning_scope) raise ActiveRecord::RecordNotFound unless issuable_before || issuable_after @@ -521,7 +524,7 @@ class IssuableBaseService < ::BaseProjectService def invalidate_cache_counts(issuable, users: []) users.each do |user| - user.public_send("invalidate_#{issuable.model_name.singular}_cache_counts") # rubocop:disable GitlabSecurity/PublicSend + user.public_send("invalidate_#{issuable.noteable_target_type_name}_cache_counts") # rubocop:disable GitlabSecurity/PublicSend end end |