Fixed sorting bug, closes #359

contributte · Sep 19, 2016 · 4eddaf6 · 4eddaf6
1 parent 132ca91
commit 4eddaf6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/src/Column/Column.php b/src/Column/Column.php
@@ -468,6 +468,17 @@ public function getSortNext()
 	}
 
 
+	/**
+	 * @return bool
+	 */
+	public function hasSortNext()
+	{
+		foreach ($this->getSortNext() as $key => $order) {
+			return $order !== FALSE;
+		}
+	}
+
+
 	/**
 	 * Is sorting ascending?
 	 * @return bool

diff --git a/src/DataGrid.php b/src/DataGrid.php
@@ -713,6 +713,11 @@ public function getSortableHandler()
 	}
 
 
+	/**
+	 * @param  array         $sort
+	 * @param  callable|NULL $sort_callback
+	 * @return void
+	 */
 	protected function createSorting(array $sort, $sort_callback)
 	{
 		foreach ($sort as $key => $order) {

diff --git a/src/templates/datagrid.latte b/src/templates/datagrid.latte
@@ -138,7 +138,7 @@
 									{include #$col_header, column => $column}
 								{else}
 									{if $column->isSortable()}
-										<a n:class="$column->isSortedBy() ? 'sort' : '', 'ajax'" n:href="sort!, sort => $column->getSortNext()" id="datagrid-sort-{$key}">
+										<a n:class="$column->isSortedBy() ? 'sort' : '', 'ajax'" {if $column->hasSortNext()}href="{link sort!, sort => $column->getSortNext()}"{else}href="{link sort!, sort => NULL}"{/if} id="datagrid-sort-{$key}">
 											{include #column-header, column => $column}
 
 											{if $column->isSortedBy()}