Merge pull request #192 from shreesh-webkul/gli-490

Fix page redirect issue after using the filter in Groups >>  Customer render list (AdminGroupsController)

Author: rohit053

Diff for: controllers/admin/AdminGroupsController.php

@@ -53,40 +53,6 @@ public function __construct()
             Configuration::get('PS_CUSTOMER_GROUP')
         );
 
-        $this->fields_list = array(
-            'id_group' => array(
-                'title' => $this->l('ID'),
-                'align' => 'center',
-                'class' => 'fixed-width-xs'
-            ),
-            'name' => array(
-                'title' => $this->l('Group name'),
-                'filter_key' => 'b!name'
-            ),
-            'reduction' => array(
-                'title' => $this->l('Discount (%)'),
-                'align' => 'right',
-                'type' => 'percent'
-            ),
-            'nb' => array(
-                'title' => $this->l('Members'),
-                'align' => 'center',
-                'havingFilter' => true,
-            ),
-            'show_prices' => array(
-                'title' => $this->l('Show prices'),
-                'align' => 'center',
-                'type' => 'bool',
-                'callback' => 'printShowPricesIcon',
-                'orderby' => false
-            ),
-            'date_add' => array(
-                'title' => $this->l('Creation date'),
-                'type' => 'date',
-                'align' => 'right'
-            )
-        );
-
         $this->addRowActionSkipList('delete', $groups_to_keep);
 
         parent::__construct();
@@ -179,17 +145,15 @@ public function initProcess()
             $this->action = 'change_show_prices_val';
         }
 
-        if (Tools::getIsset('viewgroup')) {
-            $this->list_id = 'customer_group';
+        parent::initProcess();
+    }
 
-            if (isset($_POST['submitReset'.$this->list_id])) {
-                $this->processResetFilters();
-            }
-        } else {
-            $this->list_id = 'group';
+    public function postProcess()
+    {
+        if (isset($_POST['submitResetcustomer_group'])) {
+            $this->processResetFilters('customer_group');
         }
-
-        parent::initProcess();
+        return parent::postProcess();
     }
 
     public function renderView()
@@ -598,6 +562,43 @@ public function renderList()
         $this->displayInformation($unidentified_group_information);
         $this->displayInformation($guest_group_information);
         $this->displayInformation($default_group_information);
+
+        $this->fields_list = array(
+            'id_group' => array(
+                'title' => $this->l('ID'),
+                'align' => 'center',
+                'class' => 'fixed-width-xs'
+            ),
+            'name' => array(
+                'title' => $this->l('Group name'),
+                'filter_key' => 'b!name'
+            ),
+            'reduction' => array(
+                'title' => $this->l('Discount (%)'),
+                'align' => 'right',
+                'type' => 'percent'
+            ),
+            'nb' => array(
+                'title' => $this->l('Members'),
+                'align' => 'center',
+                'havingFilter' => true,
+            ),
+            'show_prices' => array(
+                'title' => $this->l('Show prices'),
+                'align' => 'center',
+                'type' => 'bool',
+                'callback' => 'printShowPricesIcon',
+                'orderby' => false
+            ),
+            'date_add' => array(
+                'title' => $this->l('Creation date'),
+                'type' => 'date',
+                'align' => 'right'
+            )
+        );
+
+        $this->processFilter();
+
         return parent::renderList();
     }