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

Fix filters for meta columns #1002

Merged
merged 6 commits into from
Apr 29, 2024
Merged

Fix filters for meta columns #1002

merged 6 commits into from
Apr 29, 2024

Conversation

juliushaertl
Copy link
Member

@juliushaertl juliushaertl commented Apr 25, 2024 •
edited
Loading

  • fix: Avoid failing if a view filter contains a meta column
  • chore: Move meta column identifiers to constants

Likely fixes #998

@juliushaertl juliushaertl mentioned this pull request Apr 25, 2024
Closed
@juliushaertl juliushaertl added 3. to review Waiting for reviews bug Something isn't working labels Apr 25, 2024
@juliushaertl juliushaertl self-assigned this Apr 25, 2024
@enjeck
Copy link
Contributor

enjeck commented Apr 25, 2024

Cool, this probably also fixes this #979. We had been getting similar error messages for the vacation template, and I couldn't figure out how to properly fix it

@juliushaertl
Copy link
Member Author

Cool, this probably also fixes this #979. We had been getting similar error messages for the vacation template, and I couldn't figure out how to properly fix it

Oh indeed, i also didn't have this on my radar when reviewing your PR. Now I gave this a try with reverting your fix, the vacation request template seems to work properly again with this PR.

@juliushaertl juliushaertl force-pushed the fix/meta-column-filter branch 2 times, most recently from 5d1b582 to 5ba6165 Compare April 25, 2024 14:54
@juliushaertl
Copy link
Member Author

Pushed the revert and two more commits to fix an inconsistency compared to previous versions. Also moved frontend code to use the same constants

@blizzz
Copy link
Member

blizzz commented Apr 29, 2024

Cool, this probably also fixes this #979. We had been getting similar error messages for the vacation template, and I couldn't figure out how to properly fix it

And i had a foul feeling not seeing constants there.

blizzz
blizzz requested changes Apr 29, 2024
View reviewed changes
Copy link
Member

@blizzz blizzz left a comment •
edited
Loading

Choose a reason for hiding this comment

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

more usage of constants

otherwise work ✔️

lib/Service/TableTemplateService.php Outdated Show resolved Hide resolved
@juliushaertl
Copy link
Member Author

/backport to stable0.7

@backportbot backportbot bot added the backport-request Pending backport by the backport-bot label Apr 29, 2024
@juliushaertl
fix: Avoid failing if a view filter contains a meta column
89be447 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
chore: Move meta column identifiers to constants
85c55af 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
Revert "fix: do not use negative indices"
ce6e76b 
This reverts commit 91c8db9.

Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
fix: Use proper old mapping of meta column ids
cb7e7c7 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
chore: Move frontend to meta type constants
93acf7e 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliushaertl
chore: Use constants for meta columns everywhere
90a1fea 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@blizzz blizzz merged commit cda1e75 into main Apr 29, 2024
58 checks passed
@blizzz blizzz deleted the fix/meta-column-filter branch April 29, 2024 09:27
@backportbot backportbot bot mentioned this pull request Apr 29, 2024
Merged
@backportbot backportbot bot removed the backport-request Pending backport by the backport-bot label Apr 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blizzz blizzz blizzz approved these changes

@enjeck enjeck Awaiting requested review from enjeck

Assignees

@juliushaertl juliushaertl

Labels
3. to review Waiting for reviews bug Something isn't working
Projects
📝 Office team
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Tables appear empty (No entries) after update from 0.6.6 to 0.7.0 official (via App Store)
3 participants
@juliushaertl @enjeck @blizzz