Skip to content

Commit 88e1b73

Browse files
committed
Allow any filter for filteronly
1 parent f0be885 commit 88e1b73

1 file changed

Lines changed: 18 additions & 21 deletions

File tree

src/Controllers/FiltersController.php

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@ class FiltersController extends Controller
1515
use CacheVars, TicketFilters;
1616

1717
// $a_filters is in TicketFilters trait
18-
19-
// Filters that can be called via /filteronly/
20-
private $a_only_filters = ['category', 'owner', 'agent'];
21-
18+
2219
// Ticket list names and related route name
2320
private $a_lists = [
2421
'newest' => '-newest',
2522
'active' => '.index',
2623
'complete' => '-complete'
2724
];
28-
25+
2926
/*
3027
* Update a single filter
3128
*/
@@ -37,10 +34,10 @@ public function manage(Request $request, $filter, $value)
3734
if ($value == 'remove') {
3835
// Delete filter
3936
$request->session()->forget('panichd_filter_'.$filter);
40-
37+
4138
// Check all filters
4239
$this->validateFilters($request);
43-
40+
4441
} else {
4542
// Validate and add a filter
4643
$this->addAFilter($request, $filter, $value);
@@ -49,29 +46,29 @@ public function manage(Request $request, $filter, $value)
4946

5047
return \Redirect::back();
5148
}
52-
49+
5350
/*
5451
* Delete all filters and apply only the selected one
5552
*/
5653
public function only(Request $request, $filter, $value, $list)
5754
{
58-
if (in_array($filter, $this->a_only_filters) and in_array($list, array_keys($this->a_lists))){
59-
55+
if (in_array($list, array_keys($this->a_lists))){
56+
6057
// Delete each filter from session
6158
foreach ($this->a_filters as $delete){
6259
$request->session()->forget('panichd_filter_'.$delete);
6360
}
64-
61+
6562
// Validate and add a filter
6663
if ($this->addAFilter($request, $filter, $value)){
6764
// Redirect to specified route
6865
return redirect()->route(Setting::grab('main_route').$this->a_lists[$list]);
6966
}
7067
}
71-
68+
7269
return \Redirect::back();
7370
}
74-
71+
7572
/*
7673
* Add a filter and validate it
7774
*
@@ -81,18 +78,18 @@ public function addAFilter($request, $filter, $value)
8178
{
8279
// Add filter
8380
$request->session()->put('panichd_filter_'.$filter, $value);
84-
81+
8582
// Check all filters
8683
list($request, $filters_count) = $this->validateFilters($request);
87-
84+
8885
if ($filters_count > 0) {
8986
// General filter check
9087
$request->session()->put('panichd_filters','yes');
9188
}
92-
89+
9390
return $request->session()->exists('panichd_filter_'.$filter);
9491
}
95-
92+
9693
/*
9794
* Remove all filters
9895
*/
@@ -102,15 +99,15 @@ public function removeall(Request $request, $list = null)
10299
foreach ($this->a_filters as $filter){
103100
$request->session()->forget('panichd_filter_'.$filter);
104101
}
105-
102+
106103
// General filter uncheck
107104
$request->session()->forget('panichd_filters');
108-
105+
109106
if ($list != "" and array_key_exists($list, $this->a_lists)){
110107
// Redirect to specified route
111108
return redirect()->route(Setting::grab('main_route').$this->a_lists[$list]);
112109
}
113-
110+
114111
return \Redirect::back();
115112
}
116-
}
113+
}

0 commit comments

Comments
 (0)