From d48d879ef5e0b1517c43bef27f584655535259c8 Mon Sep 17 00:00:00 2001 From: Oswaldo Ferreira Date: Thu, 13 Oct 2016 12:26:44 -0300 Subject: Does not raise error when Note not found when processing NewNoteWorker - Also remove unnecessary param --- app/services/notes/create_service.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'app/services/notes/create_service.rb') diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 723cc0e6834..e338792412b 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -26,9 +26,12 @@ module Notes note.note = content end - if !only_commands && note.save + note.run_after_commit do # Finish the harder work in the background - NewNoteWorker.perform_in(2.seconds, note.id, params) + NewNoteWorker.perform_async(note.id) + end + + if !only_commands && note.save todo_service.new_note(note, current_user) end -- cgit v1.2.1 From 452d1d0824f44664484c35a2acc7c008c8167196 Mon Sep 17 00:00:00 2001 From: Ruben Davila Date: Fri, 18 Nov 2016 21:19:04 -0500 Subject: Backport some changes done from Time Tracking feature in EE. --- app/services/notes/create_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/services/notes/create_service.rb') diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index e338792412b..7935fabe2da 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -35,7 +35,7 @@ module Notes todo_service.new_note(note, current_user) end - if command_params && command_params.any? + if command_params.present? slash_commands_service.execute(command_params, note) # We must add the error after we call #save because errors are reset -- cgit v1.2.1 From ba5e98bb701672d0cf1d98a80272c16a754ec83c Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Thu, 24 Nov 2016 14:32:32 +0800 Subject: Backport Note#commands_changes from EE --- app/services/notes/create_service.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/services/notes/create_service.rb') diff --git a/app/services/notes/create_service.rb b/app/services/notes/create_service.rb index 7935fabe2da..d75592e31f3 100644 --- a/app/services/notes/create_service.rb +++ b/app/services/notes/create_service.rb @@ -43,6 +43,8 @@ module Notes if only_commands note.errors.add(:commands_only, 'Your commands have been executed!') end + + note.commands_changes = command_params.keys end note -- cgit v1.2.1