From 7cba13f8cd3acc72da19837462eff348b7bbfba3 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Thu, 26 Dec 2019 18:25:19 +0100
Subject: [PATCH] Fix custom fields

---
 app/models/messenger.rb                          | 11 ++++++++---
 lib/redmine_messenger/patches/contact_patch.rb   |  4 ++--
 lib/redmine_messenger/patches/db_entry_patch.rb  |  4 ++--
 lib/redmine_messenger/patches/issue_patch.rb     |  4 ++--
 lib/redmine_messenger/patches/password_patch.rb  |  4 ++--
 lib/redmine_messenger/patches/wiki_page_patch.rb |  4 ++--
 6 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/models/messenger.rb b/app/models/messenger.rb
index 69d665d..98656ac 100644
--- a/app/models/messenger.rb
+++ b/app/models/messenger.rb
@@ -156,14 +156,19 @@ class Messenger
       field_format = nil
       key = nil
       escape = true
+      value = detail.value.to_s
 
       if detail.property == 'cf'
         key = CustomField.find(detail.prop_key)&.name
-        title = key
-        field_format = CustomField.find(detail.prop_key)&.field_format
+        unless key.nil?
+          title = key
+          field_format = CustomField.find(detail.prop_key)&.field_format
+          value = IssuesController.helpers.format_value(detail.value, detail.custom_field) if detail.value.present?
+        end
       elsif detail.property == 'attachment'
         key = 'attachment'
         title = I18n.t :label_attachment
+        value = detail.value.to_s
       else
         key = detail.prop_key.to_s.sub('_id', '')
         title = if key == 'parent'
@@ -171,10 +176,10 @@ class Messenger
                 else
                   I18n.t "field_#{key}"
                 end
+        value = detail.value.to_s
       end
 
       short = true
-      value = detail.value.to_s
 
       case key
       when 'title', 'subject', 'description'
diff --git a/lib/redmine_messenger/patches/contact_patch.rb b/lib/redmine_messenger/patches/contact_patch.rb
index f7aaa92..532f50e 100644
--- a/lib/redmine_messenger/patches/contact_patch.rb
+++ b/lib/redmine_messenger/patches/contact_patch.rb
@@ -4,8 +4,8 @@ module RedmineMessenger
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          after_create :send_messenger_create
-          after_update :send_messenger_update
+          after_create_commit :send_messenger_create
+          after_update_commit :send_messenger_update
         end
       end
 
diff --git a/lib/redmine_messenger/patches/db_entry_patch.rb b/lib/redmine_messenger/patches/db_entry_patch.rb
index 813c083..1ec5211 100644
--- a/lib/redmine_messenger/patches/db_entry_patch.rb
+++ b/lib/redmine_messenger/patches/db_entry_patch.rb
@@ -4,8 +4,8 @@ module RedmineMessenger
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          after_create :send_messenger_create
-          after_update :send_messenger_update
+          after_create_commit :send_messenger_create
+          after_update_commit :send_messenger_update
         end
       end
 
diff --git a/lib/redmine_messenger/patches/issue_patch.rb b/lib/redmine_messenger/patches/issue_patch.rb
index ae62779..d8b1a66 100644
--- a/lib/redmine_messenger/patches/issue_patch.rb
+++ b/lib/redmine_messenger/patches/issue_patch.rb
@@ -4,8 +4,8 @@ module RedmineMessenger
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          after_create :send_messenger_create
-          after_update :send_messenger_update
+          after_create_commit :send_messenger_create
+          after_update_commit :send_messenger_update
         end
       end
 
diff --git a/lib/redmine_messenger/patches/password_patch.rb b/lib/redmine_messenger/patches/password_patch.rb
index 6dea40a..b71139b 100644
--- a/lib/redmine_messenger/patches/password_patch.rb
+++ b/lib/redmine_messenger/patches/password_patch.rb
@@ -4,8 +4,8 @@ module RedmineMessenger
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          after_create :send_messenger_create
-          after_update :send_messenger_update
+          after_create_commit :send_messenger_create
+          after_update_commit :send_messenger_update
         end
       end
 
diff --git a/lib/redmine_messenger/patches/wiki_page_patch.rb b/lib/redmine_messenger/patches/wiki_page_patch.rb
index d67d8eb..1486d8e 100644
--- a/lib/redmine_messenger/patches/wiki_page_patch.rb
+++ b/lib/redmine_messenger/patches/wiki_page_patch.rb
@@ -4,8 +4,8 @@ module RedmineMessenger
       def self.included(base)
         base.send(:include, InstanceMethods)
         base.class_eval do
-          after_create :send_messenger_create
-          after_update :send_messenger_update
+          after_create_commit :send_messenger_create
+          after_update_commit :send_messenger_update
         end
       end