More spa file changes

somleng · May 9, 2023 · a48f674 · a48f674
1 parent d09c33b
commit a48f674
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 39 deletions.
diff --git a/temba/contacts/views.py b/temba/contacts/views.py
@@ -1107,7 +1107,7 @@ def get_context_data(self, *args, **kwargs):
         def build_content_menu(self, menu):
             if self.has_org_perm("contacts.contact_delete"):
                 menu.add_js(
-                    "contacts_delete_all", _("Delete All"), "handleDeleteAllContacts(event)", "contacts-btn-delete-all"
+                    "contacts_delete_all", _("Delete All"), "handleDeleteAllConfirmation()", "contacts-btn-delete-all"
                 )
 
     class Filter(OrgObjPermsMixin, ContentMenuMixin, ContactListView):

diff --git a/templates/contacts/contact_archived.haml b/templates/contacts/contact_archived.haml
@@ -1,18 +1,6 @@
--extends "contacts/contact_list_spa.haml"
+-extends "contacts/contact_list.haml"
 -load i18n
 
--block extra-script
-  {{block.super}}
-
-  :javascript
-    var menu = document.querySelector("temba-content-menu");      
-    menu.addEventListener("temba-selection", function(event) {
-      var item = event.detail;
-      if (item.id == "contacts_delete_all") {
-        handleDeleteAllConfirmation_spa();
-      }
-    });
-
 -block title-text
   .title.leading-tight
     -trans "Archived Contacts"

diff --git a/templates/contacts/contact_blocked.haml b/templates/contacts/contact_blocked.haml
@@ -1,4 +1,4 @@
--extends "contacts/contact_list_spa.haml"
+-extends "contacts/contact_list.haml"
 -load i18n
 
 -block subtitle

diff --git a/templates/contacts/contact_filter.haml b/templates/contacts/contact_filter.haml
@@ -1,4 +1,4 @@
--extends "contacts/contact_list_spa.html"
+-extends "contacts/contact_list.html"
 -load smartmin i18n
 
 -block title

diff --git a/templates/contacts/contact_list.haml b/templates/contacts/contact_list.haml
@@ -336,36 +336,18 @@
     }
 
     {% if org_perms.contacts.contact_delete %}
-    function handleDeleteAllContacts() {
-      var deleteAllConfirmation = document.querySelector('#delete-all-confirmation');
-      deleteAllConfirmation.classList.remove("hide");
-      deleteAllConfirmation.open = true;
-
-      deleteAllConfirmation.addEventListener("temba-button-clicked", function(event){
-        if (event.detail.button.attributes.destructive){
-          jQuery.ajaxSettings.traditional = true;
-          fetchPJAXContent(document.location.href, '#pjax', {
-              postData: { action: "delete", all: 'true', pjax: 'true' },
-              forceReload: true
-          });
-
-        }
-        deleteAllConfirmation.classList.add("hide");
-        deleteAllConfirmation.open = false;
-      });
-    }
 
-    function handleDeleteAllConfirmation_spa() {
+    function handleDeleteAllConfirmation() {
       var deleteAllConfirmation = document.querySelector('#delete-all-confirmation');
 
       deleteAllConfirmation.classList.remove("hide");
       deleteAllConfirmation.open = true;
 
-      deleteAllConfirmation.removeEventListener("temba-button-clicked", handleDeleteAllContacts_spa);
-      deleteAllConfirmation.addEventListener("temba-button-clicked", handleDeleteAllContacts_spa);
+      deleteAllConfirmation.removeEventListener("temba-button-clicked", handleDeleteAllContacts);
+      deleteAllConfirmation.addEventListener("temba-button-clicked", handleDeleteAllContacts);
     }
 
-    function handleDeleteAllContacts_spa(event){
+    function handleDeleteAllContacts(event){
       var deleteAllConfirmation = document.querySelector('#delete-all-confirmation');
 
       if (event.detail.button.attributes.destructive){

diff --git a/templates/contacts/contact_stopped.haml b/templates/contacts/contact_stopped.haml
@@ -1,4 +1,4 @@
--extends "contacts/contact_list_spa.haml"
+-extends "contacts/contact_list.haml"
 -load i18n
 
 -block subtitle