#37 write correct journal entry if issue status changed from sidebar

CHANGELOG.rst

@@ -6,7 +6,7 @@ Changelog
 
 - mermaid 8.0.0 support
 - fixed close issue without permission
-
+- creating correct journal entry if issue status changed from sidebar
 
 2.0.18
 ++++++

app/controllers/additionals_change_status_controller.rb

@@ -13,6 +13,7 @@ class AdditionalsChangeStatusController < ApplicationController
       return
     end
 
+    @issue.init_journal(User.current)
     @issue.status_id = new_status_id
     @issue.assigned_to = User.current if @issue.status_x_affected?(new_status_id) && issue_old_user != User.current
 
@@ -21,29 +22,9 @@ class AdditionalsChangeStatusController < ApplicationController
       return redirect_to(issue_path(@issue))
     end
 
-    new_journal = @issue.init_journal(User.current)
-    new_journal.save!
-
     last_journal = @issue.journals.visible.order('created_on').last
 
-    JournalDetail.new(property: 'attr',
-                      prop_key: 'status_id',
-                      old_value: issue_old_status_id,
-                      value: @issue.status_id,
-                      journal: new_journal).save!
-
-    if @issue.assigned_to != issue_old_user
-      JournalDetail.new(property: 'attr',
-                        prop_key: 'assigned_to',
-                        old_value: issue_old_user,
-                        value: @issue.assigned_to,
-                        journal: new_journal).save!
-    end
-
-    if last_journal.nil?
-      redirect_to(issue_path(@issue))
-      return
-    end
+    return redirect_to(issue_path(@issue)) if last_journal.nil?
 
     last_journal = @issue.journals.visible.order('created_on').last
     redirect_to "#{issue_path(@issue)}#change-#{last_journal.id}"