AO3-5323 Disable support form #3398

ariana-paris · 2018-07-28T10:33:16Z

Issue

https://otwarchive.atlassian.net/browse/AO3-5323

Purpose

Adds a checkbox and corresponding textbox to the Admin settings so the support form can be replaced by a message.

Testing

Tick the box and add text to the field, and check that /support displays that text instead of the support form.

houndci-bot · 2018-07-28T10:33:32Z

db/migrate/20180710202259_add_disable_support_form_to_admin_settings.rb

@@ -0,0 +1,7 @@
+class AddDisableSupportFormToAdminSettings < ActiveRecord::Migration[5.1]


Style/FrozenStringLiteralComment: Missing magic comment # frozen_string_literal: true.

There's a sliiiight chance the timestamp on this might give us some issues because we've run newer migrations. If it does, though, we know where to find you. 😉

elzj

At some point, we need to clean up all the javascript and centralize and organize it, but that day is not today

redsummernight · 2018-07-29T22:43:11Z

app/controllers/feedbacks_controller.rb

@@ -4,6 +4,7 @@ class FeedbacksController < ApplicationController

  def new
    @feedback = Feedback.new
+    @admin_setting = AdminSetting.first || AdminSetting.create(last_updated_by: Admin.first)


Following #3382 should this be AdminSetting.current?

sarken · 2018-07-29T23:08:50Z

app/views/admin/settings/index.html.erb

@@ -79,3 +94,15 @@

 <p><%= ts("Last updated on %{updated_at} by %{admin_name}.", :updated_at => @admin_setting.updated_at, :admin_name => @admin_setting.last_updated ? @admin_setting.last_updated.login : "---") %></p>
 <!--/content-->
+
+
+<%= content_for :footer_js do %>


It looks like this isn't actually toggling the form field (I don't see the toggle_formfield class), so I think this can be removed. If we are actually toggling the field, though, this should really use the newer toggleFormField(element_id) function from application.js here, since as Elz pointed out, we are trying to prefer our centralized JavaScript.

Ah yes. I removed the toggle because I couldn't get the check box to both update the parameter and toggle the visibility of the textbox, so I gave up and forgot to remove the Javascript 🤦‍♀️ - I'll try to get to this later in the week! (pls poke me in Slack if no visible action by the weekend)

sarken · 2018-08-09T23:36:00Z

Just marking Needs Coder Action because there are some fresh text changes we want in this pull request.

sarken · 2018-08-22T00:40:48Z

app/views/feedbacks/new.html.erb

+<% else %>
+  <h3 class="heading"><%= ts("Please use this form for questions about how to use the Archive and to report any technical problems. We are always glad to hear from our users!") %></h3>
+  <div class="userstuff">
+    <p><%= ts("If your question or problem concerns potential violations of the Terms of Service, control of Orphaned Works, or issues requiring identity verification such as regaining access to a lost account, please <a href=\"abuse_reports/new\">contact our Policy and Abuse team</a> instead.").html_safe %></p>


To minimize the HTML Translation will need to work with, we've been moving toward doing links with interpolation instead:

<%= ts("If your question or problem concerns potential violations of the Terms of Service, control of Orphaned Works, or issues requiring identity verification such as regaining access to a lost account, please %{contact_abuse_link} instead.", contact_abuse_link: link_to(ts("contact our Policy and Abuse team"), new_abuse_report_path)).html_safe %>

I was going to merge it anyway since it's not a huge deal, but I see it has merge conflicts still. Could you update this and the link in the next paragraph when you resolve those? Then this should be good to go.

Thanks! I was in a rush to grab a small window of opportunity so went with the simple link, but this is much better. Updated and also changed the date on the migration.

Oh, yay, thanks for updating the migration as well! It looks like the Twitter link in the next paragraph didn't get updated to the new format, but since LO is trying to wrap up testing pre-hurricane, I'm going to merge this anyway.

houndci-bot · 2018-08-22T08:15:43Z

db/migrate/20180822202259_add_disable_support_form_to_admin_settings.rb

@@ -0,0 +1,7 @@
+class AddDisableSupportFormToAdminSettings < ActiveRecord::Migration[5.1]


Style/FrozenStringLiteralComment: Missing magic comment # frozen_string_literal: true.

houndci-bot reviewed Jul 28, 2018

View reviewed changes

ariana-paris force-pushed the AO3-5323-disable-support-form branch from 386d620 to ffbf7f0 Compare July 28, 2018 10:34

sarken added the Awaiting Review label Jul 29, 2018

elzj added Reviewed: Ready to Merge and removed Awaiting Review labels Jul 29, 2018

elzj approved these changes Jul 29, 2018

View reviewed changes

redsummernight reviewed Jul 29, 2018

View reviewed changes

sarken requested changes Jul 29, 2018

View reviewed changes

redsummernight added Reviewed: Action Needed and removed Reviewed: Ready to Merge labels Jul 30, 2018

ariana-paris added Coder Has Actioned Review and removed Reviewed: Action Needed labels Aug 3, 2018

sarken approved these changes Aug 4, 2018

View reviewed changes

sarken added Reviewed: Ready to Merge Reviewed: Action Needed and removed Coder Has Actioned Review Reviewed: Ready to Merge labels Aug 4, 2018

ariana-paris added Coder Has Actioned Review and removed Reviewed: Action Needed labels Aug 21, 2018

sarken requested changes Aug 22, 2018

View reviewed changes

sarken added Reviewed: Action Needed Has Migrations Contains migrations and therefore needs special attention when deploying Has Production Config Changes Modifies the config file and needs special attention when deploying and removed Coder Has Actioned Review labels Aug 22, 2018

ariana-paris added 5 commits August 22, 2018 08:59

AO3-5323 Add admin setting to disable support form

9ae1c60

AO3-5323 Don't toggle the support textbox

36b3065

AO3-5323 Display disabled text instead of support form if it is disabled

b4ee573

AO3-5323 Add AdminSetting to update controller action

e46c4db

AO3-5323 Remove unused JS and use new cached AdminSetting

1e9c2d2

ariana-paris added 2 commits August 22, 2018 09:03

AO3-5323 Update text on Support form

25e474d

AO3-5323 Update migration and link to Abuse

6c28b33

ariana-paris force-pushed the AO3-5323-disable-support-form branch from 461776a to 6c28b33 Compare August 22, 2018 08:15

houndci-bot reviewed Aug 22, 2018

View reviewed changes

sarken approved these changes Aug 22, 2018

View reviewed changes

sarken merged commit de401af into otwcode:master Aug 22, 2018

sarken added Reviewed: Ready to Merge and removed Reviewed: Action Needed labels Aug 22, 2018

ariana-paris deleted the AO3-5323-disable-support-form branch August 22, 2018 21:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

AO3-5323 Disable support form #3398

AO3-5323 Disable support form #3398

ariana-paris commented Jul 28, 2018

houndci-bot Jul 28, 2018

sarken Aug 22, 2018

elzj left a comment

redsummernight Jul 29, 2018

sarken Jul 29, 2018

ariana-paris Jul 30, 2018

sarken commented Aug 9, 2018

sarken Aug 22, 2018

ariana-paris Aug 22, 2018

sarken Aug 22, 2018

houndci-bot Aug 22, 2018

		@@ -0,0 +1,7 @@
		class AddDisableSupportFormToAdminSettings < ActiveRecord::Migration[5.1]

AO3-5323 Disable support form #3398

AO3-5323 Disable support form #3398

Conversation

ariana-paris commented Jul 28, 2018

Issue

Purpose

Testing

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elzj left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sarken commented Aug 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment