Skip to content

Make sure Advanced Filters are picked up #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2021
+16 −16
Merged

Make sure Advanced Filters are picked up #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
858c4c3
Make sure Advanced Filters are picked up
arthurkirkosa May 26, 2021
f5155fe
Fix styling
arthurkirkosa May 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Filters/AdvancedFiltersCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public function apply(RestifyRequest $request, $query): self

public static function collectQueryFilters(RestifyRequest $request, Repository $repository): self
{
$filters = json_decode(base64_decode($request->query('filters')), true);
$filters = json_decode(base64_decode($request->input('filters')), true);

$allowedFilters = $repository->collectAdvancedFilters($request);

Expand Down
30 changes: 15 additions & 15 deletions src/Repositories/ValidatingTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ public static function validatorForStoring(RestifyRequest $request, array $plain
$on->getStoringRules($request),
$messages
)->after(function ($validator) use ($request) {
static::afterValidation($request, $validator);
static::afterStoringValidation($request, $validator);
});
static::afterValidation($request, $validator);
static::afterStoringValidation($request, $validator);
});
}

public static function validatorForStoringBulk(RestifyRequest $request, array $plainPayload = null)
Expand All @@ -67,9 +67,9 @@ public static function validatorForStoringBulk(RestifyRequest $request, array $p
$on->getStoringBulkRules($request),
$messages
)->after(function ($validator) use ($request) {
static::afterValidation($request, $validator);
static::afterStoringBulkValidation($request, $validator);
});
static::afterValidation($request, $validator);
static::afterStoringBulkValidation($request, $validator);
});
}

/**
Expand Down Expand Up @@ -101,9 +101,9 @@ public static function validatorForUpdate(RestifyRequest $request, $resource = n
$on->getUpdatingRules($request),
$messages
)->after(function ($validator) use ($request) {
static::afterValidation($request, $validator);
static::afterUpdatingValidation($request, $validator);
});
static::afterValidation($request, $validator);
static::afterUpdatingValidation($request, $validator);
});
}

public static function validatorForPatch(RestifyRequest $request, $resource = null, array $plainPayload = null)
Expand All @@ -127,9 +127,9 @@ public static function validatorForPatch(RestifyRequest $request, $resource = nu
collect($on->getUpdatingRules($request))->intersectByKeys($request->json())->all(),
$messages
)->after(function ($validator) use ($request) {
static::afterValidation($request, $validator);
static::afterUpdatingValidation($request, $validator);
});
static::afterValidation($request, $validator);
static::afterUpdatingValidation($request, $validator);
});
}

public static function validatorForAttach(RestifyRequest $request, $resource = null, array $plainPayload = null)
Expand Down Expand Up @@ -179,9 +179,9 @@ public static function validatorForUpdateBulk(RestifyRequest $request, $resource
$on->getUpdatingBulkRules($request),
$messages
)->after(function ($validator) use ($request) {
static::afterValidation($request, $validator);
static::afterUpdatingBulkValidation($request, $validator);
});
static::afterValidation($request, $validator);
static::afterUpdatingBulkValidation($request, $validator);
});
}

/**
Expand Down