From 100c1d2828acd4927e80113a860f63bb8dde529a Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 28 Jan 2018 14:32:38 -0600
Subject: [PATCH] Fix #3523: Feedback notification dmails should include the
 text of the feedback.

---
 app/models/user_feedback.rb     | 2 +-
 test/unit/user_feedback_test.rb | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/user_feedback.rb b/app/models/user_feedback.rb
index a58a55a6c..310d53f45 100644
--- a/app/models/user_feedback.rb
+++ b/app/models/user_feedback.rb
@@ -91,7 +91,7 @@ class UserFeedback < ApplicationRecord
 
   def create_dmail
     unless disable_dmail_notification
-      body = %{#{creator_name} created a "#{category} record":/user_feedbacks?search[user_id]=#{user_id} for your account. #{body}}
+      body = %{@#{creator_name} created a "#{category} record":/user_feedbacks?search[user_id]=#{user_id} for your account:\n\n#{self.body}}
       Dmail.create_automated(:to_id => user_id, :title => "Your user record has been updated", :body => body)
     end
   end
diff --git a/test/unit/user_feedback_test.rb b/test/unit/user_feedback_test.rb
index f98d5189f..583b721e9 100644
--- a/test/unit/user_feedback_test.rb
+++ b/test/unit/user_feedback_test.rb
@@ -16,9 +16,16 @@ class UserFeedbackTest < ActiveSupport::TestCase
       gold = FactoryGirl.create(:gold_user)
       member = FactoryGirl.create(:user)
 
+      dmail = <<~EOS.chomp
+        @#{gold.name} created a "positive record":/user_feedbacks?search[user_id]=#{user.id} for your account:
+
+        good job!
+      EOS
+
       CurrentUser.user = gold
       assert_difference("Dmail.count", 1) do
-        FactoryGirl.create(:user_feedback, :user => user)
+        FactoryGirl.create(:user_feedback, :user => user, :body => "good job!")
+        assert_equal(dmail, user.dmails.last.body)
       end
     end