From 6b64910c9daddd87ffa89ee6ea0e1bed745ea6ec Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Thu, 18 Feb 2016 20:14:48 +0200
Subject: [PATCH] Prevent reloading page when showing/hiding archived

---
 app/Http/Controllers/AccountController.php         | 8 +-------
 resources/views/accounts/api_tokens.blade.php      | 8 ++++++--
 resources/views/accounts/user_management.blade.php | 6 +++++-
 resources/views/datatable.blade.php                | 6 +++++-
 resources/views/list.blade.php                     | 6 +++++-
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index 4b12b6802e90..6c0f59a3ba91 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -117,13 +117,7 @@ class AccountController extends BaseController
     {
         Session::put("show_trash:{$entityType}", $visible == 'true');
 
-        if ($entityType == 'user') {
-            return Redirect::to('settings/'.ACCOUNT_USER_MANAGEMENT);
-        } elseif ($entityType == 'token') {
-            return Redirect::to('settings/'.ACCOUNT_API_TOKENS);
-        } else {
-            return Redirect::to("{$entityType}s");
-        }
+        return RESULT_SUCCESS;
     }
 
     public function getSearchData()
diff --git a/resources/views/accounts/api_tokens.blade.php b/resources/views/accounts/api_tokens.blade.php
index efbd41e283e1..4612b1cbfedd 100644
--- a/resources/views/accounts/api_tokens.blade.php
+++ b/resources/views/accounts/api_tokens.blade.php
@@ -42,9 +42,13 @@
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
-        window.location = '{!! URL::to('view_archive/token') !!}' + (checked ? '/true' : '/false');
+        var url = '{{ URL::to('view_archive/token') }}' + (checked ? '/true' : '/false');
+
+        $.get(url, function(data) {
+            refreshDatatable();
+        })
     }
-    
+
   </script>
 
 @stop
diff --git a/resources/views/accounts/user_management.blade.php b/resources/views/accounts/user_management.blade.php
index 0fc17a7a3fa4..a7f70f925b7a 100644
--- a/resources/views/accounts/user_management.blade.php
+++ b/resources/views/accounts/user_management.blade.php
@@ -39,7 +39,11 @@
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
-        window.location = '{!! URL::to('view_archive/user') !!}' + (checked ? '/true' : '/false');
+        var url = '{{ URL::to('view_archive/user') }}' + (checked ? '/true' : '/false');
+
+        $.get(url, function(data) {
+            refreshDatatable();
+        })
     }
 
   </script>
diff --git a/resources/views/datatable.blade.php b/resources/views/datatable.blade.php
index 2d0b78d9faa4..4c73a7d24875 100644
--- a/resources/views/datatable.blade.php
+++ b/resources/views/datatable.blade.php
@@ -42,8 +42,12 @@
         });
     @endif
 
+    function refreshDatatable() {
+        window.dataTable.api().ajax.reload();
+    }
+
     function load_{{ $class }}() {
-        jQuery('.{{ $class }}').dataTable({
+        window.dataTable = jQuery('.{{ $class }}').dataTable({
             "fnRowCallback": function(row, data) { 
                 if (data[0].indexOf('ENTITY_DELETED') > 0) {
                     $(row).addClass('entityDeleted');
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 93aebcebb262..6e567bf3de75 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -101,7 +101,11 @@
 
 	function setTrashVisible() {
 		var checked = $('#trashed').is(':checked');
-		window.location = '{{ URL::to('view_archive/' . $entityType) }}' + (checked ? '/true' : '/false');
+		var url = '{{ URL::to('view_archive/' . $entityType) }}' + (checked ? '/true' : '/false');
+
+        $.get(url, function(data) {
+            refreshDatatable();
+        })
 	}
 
     $(function() {