Skip to content
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

Search Kit - Fix display pager and improve error handling #19479

Merged
merged 2 commits into from
Feb 1, 2021
Merged

Search Kit - Fix display pager and improve error handling #19479

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
b94d056
Fix hard-crash when afform fails to render
colemanw Feb 1, 2021
e096625
Search Kit - Fix display pager
colemanw Feb 1, 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
3 changes: 2 additions & 1 deletion ext/afform/core/Civi/Afform/AfformMetadataInjector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public static function preprocess($e) {
else {
$entityName = pq($fieldset)->attr('af-fieldset');
if (!preg_match(';^[a-zA-Z0-9\_\-\. ]+$;', $entityName)) {
throw new \CRM_Core_Exception("Cannot process $path: malformed entity name ($entityName)");
\Civi::log()->error("Afform error: cannot process $path: malformed entity name ($entityName)");
return;
}
$entityType = $entities[$entityName]['type'];
}
Expand Down
2 changes: 1 addition & 1 deletion ext/search/ang/crmSearchDisplay/Pager.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
total-items="$ctrl.rowCount"
ng-model="$ctrl.page"
ng-change="$ctrl.getResults()"
items-per-page="$ctrl.limit"
items-per-page="$ctrl.apiParams.limit"
max-size="6"
force-ellipses="true"
previous-text="‹"
Expand Down