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

Jump to bottom

Import preview should display data correctly with Black/Whitelisting #1825

Merged
merged 1 commit into from
Apr 9, 2019
Merged

Import preview should display data correctly with Black/Whitelisting #1825

merged 1 commit into from
Apr 9, 2019

Conversation

lazyfrosch
Copy link
Contributor

Only affects Preview of an ImportSource.

This will make sure applying modifiers before initializing the
ArrayDatasource.

Before this change counting and pagination was broken with Black and
Whitelist.

@lazyfrosch
ImportSourceHookTable: Apply modifiers when fetching data
48931b1 
This will make sure applying modifiers before initializing the
ArrayDatasource.

Before this change counting and pagination was broken with Black and
Whitelist.
@lazyfrosch lazyfrosch added this to the 1.7.0 milestone Apr 9, 2019
@lazyfrosch lazyfrosch self-assigned this Apr 9, 2019
@lazyfrosch lazyfrosch changed the title ImportSourceHookTable: Apply modifiers when fetching data Preview should display data correctly with Black/Whitelisting Apr 9, 2019
@lazyfrosch lazyfrosch changed the title Preview should display data correctly with Black/Whitelisting Import preview should display data correctly with Black/Whitelisting Apr 9, 2019
Thomas-Gelf
Thomas-Gelf approved these changes Apr 9, 2019
View reviewed changes
Copy link
Contributor

@Thomas-Gelf Thomas-Gelf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! Also removing $dataCache looks good to me: prepareQuery() should be called only once via getQuery() - and count()'s are handled via ArrayDatasource.

Thanks,
Thomas

@Thomas-Gelf Thomas-Gelf merged commit c5a79c6 into master Apr 9, 2019
@Thomas-Gelf Thomas-Gelf deleted the bugfix/preview-blacklisted branch April 9, 2019 19:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Thomas-Gelf Thomas-Gelf Thomas-Gelf approved these changes

Assignees

@lazyfrosch lazyfrosch

Labels
area/UI bug
Projects
None yet
Milestone
1.7.0
Development

Successfully merging this pull request may close these issues.
2 participants
@lazyfrosch @Thomas-Gelf