diff --git a/app/controllers/feedback_messages_controller.rb b/app/controllers/feedback_messages_controller.rb index f34869f6c..926f7d7b7 100644 --- a/app/controllers/feedback_messages_controller.rb +++ b/app/controllers/feedback_messages_controller.rb @@ -12,7 +12,7 @@ class FeedbackMessagesController < ApplicationController @feedback_message = FeedbackMessage.new(params) recaptcha_enabled = ReCaptcha::CheckEnabled.call(current_user) - if (!recaptcha_enabled || recaptcha_verified? || connect_feedback?) && !rate_limit? && @feedback_message.save + if (!recaptcha_enabled || recaptcha_verified?) && !rate_limit? && @feedback_message.save Slack::Messengers::Feedback.call( user: current_user, type: feedback_message_params[:feedback_type], @@ -57,10 +57,6 @@ class FeedbackMessagesController < ApplicationController params["g-recaptcha-response"] && verify_recaptcha(recaptcha_params) end - def connect_feedback? - feedback_message_params[:feedback_type] == "connect" - end - def feedback_message_params params.require(:feedback_message).permit(FEEDBACK_ALLOWED_PARAMS) end diff --git a/app/views/admin/feedback_messages/_feedback_message.html.erb b/app/views/admin/feedback_messages/_feedback_message.html.erb index 270311741..a5444a877 100644 --- a/app/views/admin/feedback_messages/_feedback_message.html.erb +++ b/app/views/admin/feedback_messages/_feedback_message.html.erb @@ -19,7 +19,7 @@
- <% if feedback_message.message.blank? %> - No message was left. - <% else %> - <%= feedback_message.message %> - <% end %> -
- <% else %> + <% if feedback_message.offender %>+ <% if feedback_message.message.blank? %> + No message was left. + <% else %> + <%= feedback_message.message %> + <% end %> +
<% end %>