@@ -32,25 +32,42 @@ public function restGet($id, $queryParser) {
32
32
$ this ->preRestGet ($ queryParser , $ id );
33
33
34
34
foreach ($ queryParser ->getIncludes () as $ include ) {
35
- if (!$ include ->ignoreAuto ) $ this ->applyIncludeOne ($ include );
35
+ if (!$ include ->ignoreAuto ) {
36
+ $ this ->applyIncludeOne ($ include );
37
+ }
38
+ }
39
+ foreach ($ queryParser ->getFilters () as $ filter ) {
40
+ if (!$ filter ->ignoreAuto ) {
41
+ $ this ->applyFilter ($ filter );
42
+ }
36
43
}
37
- foreach ($ queryParser ->getFilters () as $ filter ) $ this ->applyFilter ($ filter );
38
44
$ searchFilters = $ queryParser ->getSearchFilters ();
39
45
if (count ($ searchFilters )) {
40
46
$ this ->groupStart ();
41
- foreach ($ searchFilters as $ filter ) $ this ->applyFilter ($ filter );
47
+ foreach ($ searchFilters as $ filter ) {
48
+ if (!$ filter ->ignoreAuto ) {
49
+ $ this ->applyFilter ($ filter );
50
+ }
51
+ }
42
52
$ this ->groupEnd ();
43
53
}
44
54
45
55
if ($ queryParser ->isCount ()) {
46
56
$ count = $ this ->distinct ('id ' )->countAllResults ();
47
- //Data::lastQuery();
48
57
return $ count ;
49
58
}
50
59
51
- if ($ queryParser ->hasLimit ()) $ this ->limit ($ queryParser ->getLimit ());
52
- if ($ queryParser ->hasOffset ()) $ this ->offset ($ queryParser ->getOffset ());
53
- foreach ($ queryParser ->getOrdering () as $ order ) $ this ->applyOrder ($ order );
60
+ if ($ queryParser ->hasLimit ()) {
61
+ $ this ->limit ($ queryParser ->getLimit ());
62
+ }
63
+ if ($ queryParser ->hasOffset ()) {
64
+ $ this ->offset ($ queryParser ->getOffset ());
65
+ }
66
+ foreach ($ queryParser ->getOrdering () as $ order ) {
67
+ if (!$ order ->ignoreAuto ) {
68
+ $ this ->applyOrder ($ order );
69
+ }
70
+ }
54
71
55
72
/** @var Entity $items */
56
73
$ items = $ this
0 commit comments