bug fix urlFilterColumn

crocodic-studio · Apr 8, 2017 · d3cfdbc · d3cfdbc
1 parent e584b79
commit d3cfdbc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/helpers/CRUDBooster.php b/src/helpers/CRUDBooster.php
@@ -747,11 +747,11 @@ public static function isForeignKey($fieldName) {
         	}
 	    }
 
-		public static function changeFilterColumnURI($key,$type,$value='',$singleSorting=true) {
+		public static function urlFilterColumn($key,$type,$value='',$singleSorting=true) {
 	        $params = Request::all();
 	        $mainpath = trim(self::mainpath(),'/');	        
 
-	        if($params['filter_column']) {
+	        if($params['filter_column'] && $singleSorting) {
 	        	foreach($params['filter_column'] as $k=>$filter) {
 		        	foreach($filter as $t=>$val) {
 		        		if($t=='sorting') {

diff --git a/src/views/default/table.blade.php b/src/views/default/table.blade.php
@@ -63,20 +63,20 @@ function(){
                             if(isset($sort_column[$field])) {
                               switch($sort_column[$field]['sorting']) {                                
                                 case 'asc': 
-                                  $url = CRUDBooster::changeFilterColumnURI($field,'sorting','desc');
+                                  $url = CRUDBooster::urlFilterColumn($field,'sorting','desc');
                                   echo "<a href='$url' title='Click to sort descending'>$colname &nbsp; <i class='fa fa-sort-desc'></i></a>";
                                   break;
                                 case 'desc':
-                                  $url = CRUDBooster::changeFilterColumnURI($field,'sorting','asc');
+                                  $url = CRUDBooster::urlFilterColumn($field,'sorting','asc');
                                   echo "<a href='$url' title='Click to sort ascending'>$colname &nbsp; <i class='fa fa-sort-asc'></i></a>";
                                   break;
                                 default:
-                                  $url = CRUDBooster::changeFilterColumnURI($field,'sorting','asc');
+                                  $url = CRUDBooster::urlFilterColumn($field,'sorting','asc');
                                   echo "<a href='$url' title='Click to sort ascending'>$colname &nbsp; <i class='fa fa-sort'></i></a>";
                                   break;      
                               }
                             }else{     
-                                  $url = CRUDBooster::changeFilterColumnURI($field,'sorting','asc');                         
+                                  $url = CRUDBooster::urlFilterColumn($field,'sorting','asc');                         
                                   echo "<a href='$url' title='Click to sort ascending'>$colname &nbsp; <i class='fa fa-sort'></i></a>";                                  
                             }