Fixed sorting: let the previous remain after filtering

src/DataGrid.php

@@ -1773,6 +1773,14 @@ public function filterSucceeded(Form $form)
 			/**
 			 * Session stuff
 			 */
+			if ($this->remember_state && $this->getSessionData($key) != $value) {
+				/**
+				 * Has been filter changed?
+				 */
+				$this->page = 1;
+				$this->saveSessionData('_grid_page', 1);
+			}
+
 			$this->saveSessionData($key, $value);
 
 			/**
@@ -2246,7 +2254,8 @@ public function handleSort(array $sort)
 
 		$this->saveSessionData('_grid_has_sorted', 1);
 		$this->saveSessionData('_grid_sort', $this->sort = $sort);
-		$this->reload(['table']);
+
+		$this->reloadTheWholeGrid();
 	}
 
 
@@ -2285,7 +2294,7 @@ public function handleResetFilter()
 
 		$this->filter = [];
 
-		$this->reload(['grid']);
+		$this->reloadTheWholeGrid();
 	}
 
 
@@ -2298,7 +2307,7 @@ public function handleResetColumnFilter($key)
 		$this->deleteSessionData($key);
 		unset($this->filter[$key]);
 
-		$this->reload(['grid']);
+		$this->reloadTheWholeGrid();
 	}
 
 
@@ -2509,6 +2518,24 @@ public function reload($snippets = [])
 	}
 
 
+	/**
+	 * @return void
+	 */
+	public function reloadTheWholeGrid()
+	{
+		if ($this->getPresenter()->isAjax()) {
+			$this->redrawControl('grid');
+
+			$this->getPresenter()->payload->_datagrid_url = $this->refresh_url;
+			$this->getPresenter()->payload->_datagrid_name = $this->getName();
+
+			$this->onRedraw();
+		} else {
+			$this->getPresenter()->redirect('this');
+		}
+	}
+
+
 	/**
 	 * Handler for column status
 	 * @param  string $id