kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Add back call to execute_hooks

This commit is contained in:
Brett Walker 2019-01-25 09:41:21 -06:00 committed by Fatih Acet
parent ec66cf0a17
commit 549821a59f
No known key found for this signature in database
GPG Key ID: E994FE39E29B7E11
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
app/models/concerns/issuable.rb
View File

@ -270,26 +270,29 @@ module Issuable
def to_hook_data(user, old_associations: {})
changes = previous_changes
old_labels = old_associations.fetch(:labels, [])
old_assignees = old_associations.fetch(:assignees, [])
if old_labels != labels
changes[:labels] = [old_labels.map(&:hook_attrs), labels.map(&:hook_attrs)]
end
if old_associations
old_labels = old_associations.fetch(:labels, [])
old_assignees = old_associations.fetch(:assignees, [])
if old_assignees != assignees
if self.is_a?(Issue)
changes[:assignees] = [old_assignees.map(&:hook_attrs), assignees.map(&:hook_attrs)]
else
changes[:assignee] = [old_assignees&.first&.hook_attrs, assignee&.hook_attrs]
if old_labels != labels
changes[:labels] = [old_labels.map(&:hook_attrs), labels.map(&:hook_attrs)]
end
end
if self.respond_to?(:total_time_spent)
old_total_time_spent = old_associations.fetch(:total_time_spent, nil)
if old_assignees != assignees
if self.is_a?(Issue)
changes[:assignees] = [old_assignees.map(&:hook_attrs), assignees.map(&:hook_attrs)]
else
changes[:assignee] = [old_assignees&.first&.hook_attrs, assignee&.hook_attrs]
end
end
if old_total_time_spent != total_time_spent
changes[:total_time_spent] = [old_total_time_spent, total_time_spent]
if self.respond_to?(:total_time_spent)
old_total_time_spent = old_associations.fetch(:total_time_spent, nil)
if old_total_time_spent != total_time_spent
changes[:total_time_spent] = [old_total_time_spent, total_time_spent]
end
end
end

6
app/services/issuable_base_service.rb
View File

@ -237,7 +237,6 @@ class IssuableBaseService < BaseService
def update_task(issuable)
filter_params(issuable)
# old_associations = associations_before_update(issuable)
if issuable.changed? || params.present?
issuable.assign_attributes(params.merge(updated_by: current_user))
@ -252,12 +251,9 @@ class IssuableBaseService < BaseService
end
handle_task_changes(issuable)
invalidate_cache_counts(issuable, users: issuable.assignees.to_a)
after_update(issuable)
# execute_hooks(issuable, 'update', old_associations: old_associations)
execute_hooks(issuable, 'update', old_associations: nil)
end
end