Merge tag 'v1.6.1' into fiksgatami-dev

1 files changed, 24 insertions, 26 deletions

diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js
index 1663dda7b..5e0d873c5 100644
--- a/web/js/fixmystreet-admin.js
+++ b/web/js/fixmystreet-admin.js
@@ -3,13 +3,13 @@ $(function(){
 
     // hide the open311_only section and reveal it only when send_method is relevant
     var $open311_only = $('.admin-open311-only');
- 
+
     function hide_or_show_open311(hide_fast) {
         var send_method = $('#send_method').val();
         var show_open311 = false;
         if ($('#endpoint').val()) {
             show_open311 = true; // always show the form if there is an endpoint value
-        } else if (send_method && send_method.toLowerCase() != 'email') {
+        } else if (send_method && !send_method.match(/^(email|emptyhomes|noop|refused)$/i)) {
             show_open311 = true;
         }
         if (show_open311) {
@@ -28,34 +28,32 @@ $(function(){
         hide_or_show_open311(true);
     }
 
-    if ($('body').hasClass("show-admin-notes")) {
 
-        // admin hints: maybe better implemented as tooltips?
-        $(".admin-hint").on('click', function(){
-            if ($(this).hasClass('admin-hint-show')) {
-                $(this).removeClass('admin-hint-show');
+    // admin hints: maybe better implemented as tooltips?
+    $(".admin-hint").on('click', function(){
+        if ($(this).hasClass('admin-hint-show')) {
+            $(this).removeClass('admin-hint-show');
+        } else {
+            $(this).addClass('admin-hint-show');
+        }
+    });
+
+    // on a body's page, hide/show deleted contact categories
+    var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
+    if ($table_with_deleted_contacts.length == 1) {
+        var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
+        $table_with_deleted_contacts.before($toggle_deleted_btn);
+        $toggle_deleted_btn.on('click', function(e){
+            e.preventDefault();
+            var $cols = $table_with_deleted_contacts.find('tr.is-deleted');
+            if ($cols.first().is(':visible')) {
+                $cols.hide();
+                $(this).prop("value", 'Show deleted contacts');
             } else {
-                $(this).addClass('admin-hint-show');
+                $cols.show();
+                $(this).prop("value", 'Hide deleted contacts');
             }
         });
-
-        // on a body's page, hide/show deleted contact categories
-        var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table');
-        if ($table_with_deleted_contacts.length == 1) {
-            var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>");
-            $table_with_deleted_contacts.before($toggle_deleted_btn);
-            $toggle_deleted_btn.on('click', function(e){
-                e.preventDefault();
-                var $cols = $table_with_deleted_contacts.find('tr.is-deleted');
-                if ($cols.first().is(':visible')) {
-                    $cols.hide();
-                    $(this).prop("value", 'Show deleted contacts');
-                } else {
-                    $cols.show();
-                    $(this).prop("value", 'Hide deleted contacts');
-                }
-            });
-        }
     }
 
     $( "#start_date" ).datepicker({