Merge branch 'filterjust' into dev

Author: xaviqv

src/Controllers/FiltersController.php

@@ -15,17 +15,14 @@ class FiltersController extends Controller
     use CacheVars, TicketFilters;
 
 	// $a_filters is in TicketFilters trait
-	
-	// Filters that can be called via /filteronly/
-	private $a_only_filters = ['category', 'owner', 'agent'];
-	
+
 	// Ticket list names and related route name
 	private $a_lists = [
 		'newest' => '-newest',
 		'active' => '.index',
 		'complete' => '-complete'
 	];
-	
+
 	/*
 	 * Update a single filter
 	*/
@@ -37,10 +34,10 @@ public function manage(Request $request, $filter, $value)
             if ($value == 'remove') {
                 // Delete filter
                 $request->session()->forget('panichd_filter_'.$filter);
-				
+
 				// Check all filters
 				$this->validateFilters($request);
-				
+
             } else {
                 // Validate and add a filter
 				$this->addAFilter($request, $filter, $value);
@@ -49,29 +46,89 @@ public function manage(Request $request, $filter, $value)
 
         return \Redirect::back();
     }
-	
+
 	/*
 	 * Delete all filters and apply only the selected one
 	*/
 	public function only(Request $request, $filter, $value, $list)
 	{
-		if (in_array($filter, $this->a_only_filters) and in_array($list, array_keys($this->a_lists))){
-			
+		if (in_array($list, array_keys($this->a_lists))){
+
 			// Delete each filter from session
 			foreach ($this->a_filters as $delete){
 				$request->session()->forget('panichd_filter_'.$delete);
 			}
-			
+
 			// Validate and add a filter
 			if ($this->addAFilter($request, $filter, $value)){
 				// Redirect to specified route
 				return redirect()->route(Setting::grab('main_route').$this->a_lists[$list]);
 			}
 		}
-		
+
 		return \Redirect::back();
 	}
-	
+
+    /*
+	 * Delete all previous filters and apply just the valid ones from the requested
+     * You may specify a ticket list as a final parameter (like URL/complete) o as key/value (like URL/list/complete)
+	*/
+    public function just(Request $request, $parameters)
+    {
+        // Get URL parameters and replace a_current array with them
+        $a_temp = explode('/', $parameters);
+        $a_valid = [];
+        $list = false;
+
+        $i = 0;
+        $filter = "";
+        foreach($a_temp as $param){
+            $i++;
+            if ($filter == ""){
+                if (!$list and $i == count($a_temp) and array_key_exists($param, $this->a_lists)){
+                    // Allow ticket list as a last parameter if not set as list/list_key in previous parameters
+                    $list = $param;
+                }else
+                    $filter = $param;
+            }else{
+                if(in_array($filter, $this->a_filters)){
+                    // Add filter to validate
+                    $a_valid[$filter] = $param;
+                }elseif($filter == 'list' and array_key_exists($param, $this->a_lists)){
+                    // Select ticket list
+                    $list = $param;
+                }
+                $filter = "";
+            }
+        }
+
+        // Delete each filter from session
+        foreach ($this->a_filters as $delete){
+            $request->session()->forget('panichd_filter_'.$delete);
+        }
+
+        if ($a_valid){
+            foreach ($a_valid as $filter => $value){
+                // Add filter
+        		$request->session()->put('panichd_filter_'.$filter, $value);
+            }
+
+            // Check all filters
+    		list($request, $filters_count) = $this->validateFilters($request);
+
+    		if ($filters_count > 0) {
+    			// General filter check
+    			$request->session()->put('panichd_filters','yes');
+    		}
+        }
+
+        if ($list){
+            // Redirect to specified list
+            return redirect()->route(Setting::grab('main_route') . $this->a_lists[$list]);
+        }else
+            return redirect()->route(Setting::grab('main_route') . '.index');
+    }
+
 	/*
 	 * Add a filter and validate it
 	 *
@@ -81,18 +138,18 @@ public function addAFilter($request, $filter, $value)
 	{
 		// Add filter
 		$request->session()->put('panichd_filter_'.$filter, $value);
-		
+
 		// Check all filters
 		list($request, $filters_count) = $this->validateFilters($request);
-	   
+
 		if ($filters_count > 0) {
 			// General filter check
 			$request->session()->put('panichd_filters','yes');
 		}
-		
+
 		return $request->session()->exists('panichd_filter_'.$filter);
 	}
-	
+
 	/*
 	 * Remove all filters
 	*/
@@ -102,15 +159,15 @@ public function removeall(Request $request, $list = null)
 		foreach ($this->a_filters as $filter){
 			$request->session()->forget('panichd_filter_'.$filter);
 		}
-		
+
 		// General filter uncheck
 		$request->session()->forget('panichd_filters');
-		
+
 		if ($list != "" and array_key_exists($list, $this->a_lists)){
 			// Redirect to specified route
 			return redirect()->route(Setting::grab('main_route').$this->a_lists[$list]);
 		}
-		
+
 		return \Redirect::back();
 	}
-}
+}

src/routes.php

@@ -116,8 +116,14 @@
         Route::get("$main_route_path/filter/{filter}/{value}", 'PanicHD\PanicHD\Controllers\FiltersController@manage');
 
 		// Use single filter in specified list
+        // TODO: Delete this route and controller method. Use filterjust instead
 		Route::get("$main_route_path/filteronly/{filter}/{value}/{list}", 'PanicHD\PanicHD\Controllers\FiltersController@only')
 			->name("$main_route-filteronly");
+
+        // Use just the specified filters (one or many)
+        Route::get("$main_route_path/filterjust/{parameters?}", 'PanicHD\PanicHD\Controllers\FiltersController@just')
+            ->where('parameters', '(.*)')
+            ->name("$main_route-filterjust");
     });
 
     Route::group(['middleware' => 'PanicHD\PanicHD\Middleware\IsAdminMiddleware'], function () use ($admin_route, $admin_route_path) {