diff options
| author | Nikita Verkhovin <vernik91@gmail.com> | 2015-02-07 14:14:55 +0300 |
|---|---|---|
| committer | Nikita Verkhovin <vernik91@gmail.com> | 2015-02-08 19:35:41 +0300 |
| commit | 8681cb3137511e51e19f76aef9839be28f8fcd6a (patch) | |
| tree | f2d5a929763d77b12c4248cc1bb50a01766bcbfe /app/services | |
| parent | 0a34f2dcb562098c481140246f7ac22683b38d76 (diff) | |
Add labels notes
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/issuable_base_service.rb | 5 | ||||
| -rw-r--r-- | app/services/issues/update_service.rb | 7 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 10 |
3 files changed, 22 insertions, 0 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index e3371ec3c1b..5e1906ad2ae 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -10,4 +10,9 @@ class IssuableBaseService < BaseService Note.create_milestone_change_note( issuable, issuable.project, current_user, issuable.milestone) end + + def create_labels_note(issuable, added_labels, removed_labels) + Note.create_labels_change_note( + issuable, issuable.project, current_user, added_labels, removed_labels) + end end diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 83e413d7248..c61d67a7893 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -14,10 +14,17 @@ module Issues issue.update_nth_task(params[:task_num].to_i, false) end + old_labels = issue.labels.to_a + if params.present? && issue.update_attributes(params.except(:state_event, :task_num)) issue.reset_events_cache + if issue.labels != old_labels + create_labels_note( + issue, issue.labels - old_labels, old_labels - issue.labels) + end + if issue.previous_changes.include?('milestone_id') create_milestone_note(issue) end diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index 10c401756eb..870b50bb60d 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -23,11 +23,21 @@ module MergeRequests merge_request.update_nth_task(params[:task_num].to_i, false) end + old_labels = merge_request.labels.to_a + if params.present? && merge_request.update_attributes( params.except(:state_event, :task_num) ) merge_request.reset_events_cache + if merge_request.labels != old_labels + create_labels_note( + merge_request, + merge_request.labels - old_labels, + old_labels - merge_request.labels + ) + end + if merge_request.previous_changes.include?('milestone_id') create_milestone_note(merge_request) end |