diff --git a/app/helpers/feedback_messages_helper.rb b/app/helpers/feedback_messages_helper.rb index 765208022..a9dc2ffe8 100644 --- a/app/helpers/feedback_messages_helper.rb +++ b/app/helpers/feedback_messages_helper.rb @@ -15,20 +15,6 @@ module FeedbackMessagesHelper { subject: "#{SiteConfig.community_name} Code of Conduct Violation", body: body }.freeze end - def reporter_email_details - body = <<~HEREDOC - Hi there, - - Thank you for flagging content that may be in violation of the #{SiteConfig.community_name} Code of Conduct and/or our Terms of Use. We are looking into your report and will take appropriate action. - - We appreciate your help as we work to foster a positive and inclusive environment for all! - - #{SiteConfig.community_name} Team - HEREDOC - - { subject: "#{SiteConfig.community_name} Report", body: body }.freeze - end - def affected_email_details body = <<~HEREDOC Hi there, diff --git a/app/views/admin/feedback_messages/_feedback_message.html.erb b/app/views/admin/feedback_messages/_feedback_message.html.erb index 6b09f64c4..46cda8b79 100644 --- a/app/views/admin/feedback_messages/_feedback_message.html.erb +++ b/app/views/admin/feedback_messages/_feedback_message.html.erb @@ -43,7 +43,7 @@ @<%= feedback_message.offender.username %> <% else %> -
+
Reported URL (new tab):
@@ -74,12 +74,12 @@

<% else %>
- Message from Offender: -
-
- <%= raw(feedback_message.message) %> -
- <% end %> + Message from Offender: + +
+ <%= raw(feedback_message.message) %> +
+ <% end %>
@@ -108,25 +108,14 @@

Email Form:

-
-
Send To:
- <%= email_field_tag :reporter_email_to, feedback_message.reporter&.email, class: "form-control my-1", id: "reporter__emailto__#{feedback_message.id}", required: true %> -
Subject:
- <%= text_field_tag :reporter_email_subject, reporter_email_details[:subject], class: "form-control my-1", id: "reporter__subject__#{feedback_message.id}" %> -
Body:
- <%= text_area_tag :reporter_email_body, reporter_email_details[:body], class: "form-control my-1", style: "height: 300px;", id: "reporter__body__#{feedback_message.id}" %> -
-
+
Send To:
<%= email_field_tag :offender_email_to, feedback_message.offender&.email, class: "form-control my-1", id: "offender__emailto__#{feedback_message.id}", required: true %>
Subject:
diff --git a/spec/helpers/feedback_messages_helper_spec.rb b/spec/helpers/feedback_messages_helper_spec.rb index d357be8b5..80ef53148 100644 --- a/spec/helpers/feedback_messages_helper_spec.rb +++ b/spec/helpers/feedback_messages_helper_spec.rb @@ -10,15 +10,6 @@ RSpec.describe FeedbackMessagesHelper, type: :helper do end end - describe "#reporter_email_details" do - it "have proper subject and body" do - expect(helper.reporter_email_details).to include( - subject: "#{SiteConfig.community_name} Report", - body: a_string_starting_with("Hi"), - ) - end - end - describe "#affected_email_details" do it "have proper subject and body" do expect(helper.affected_email_details).to include(