Skip to content

Filter out backup user status (those beginning with _ as userId) - #34569

Merged
PVince81 merged 3 commits into
masterfrom
filterOutBackupStatus
Oct 14, 2022
Merged

Filter out backup user status (those beginning with _ as userId)#34569
PVince81 merged 3 commits into
masterfrom
filterOutBackupStatus

Conversation

@tobiasKaminsky

@tobiasKaminskytobiasKaminsky commented Oct 13, 2022

Copy link
Copy Markdown
Member

Fix#34464

Maybe it is smarter to do it directly on DB level, but I failed to do so…

@tobiasKaminskytobiasKaminsky added the 3. to review Waiting for reviews label Oct 13, 2022
nickvergessen
nickvergessen approved these changes Oct 13, 2022
View reviewed changes
Comment threadapps/user_status/lib/Dashboard/UserStatusWidget.php Outdated
Comment threadapps/user_status/lib/Dashboard/UserStatusWidget.php
@nickvergessennickvergessen added this to the Nextcloud 26 milestone Oct 13, 2022
@nickvergessen

nickvergessen commented Oct 13, 2022

Copy link
Copy Markdown
Member

/backport to stable25

CarlSchwan
CarlSchwan requested changes Oct 13, 2022
View reviewed changes

@CarlSchwanCarlSchwan left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Actually doing that on the db status is a better idea. Can i push yo your branch?

@tobiasKaminsky

tobiasKaminsky commented Oct 13, 2022

Copy link
Copy Markdown
MemberAuthor

Actually doing that on the db status is a better idea. Can i push yo your branch?

Sure! I just was not able to do it, knowledge wise.
Else I would also have done it, as it is the cleaner way and also has not drawbacks as Joas mentioned.

github-advanced-security[bot]
github-advanced-securityAI found potential problems Oct 13, 2022
View reviewed changes
Comment threadapps/user_status/lib/Db/UserStatusMapper.php Fixed
@julien-nc

julien-nc commented Oct 13, 2022

Copy link
Copy Markdown
Member

@CarlSchwan I hope you don't mind me pushing here. I just fixed your typo leading to a syntax error.

@julien-nc
julien-nc self-requested a review October 13, 2022 13:31
@tobiasKaminsky

tobiasKaminsky commented Oct 13, 2022

Copy link
Copy Markdown
MemberAuthor

"message": "Internal Server Error\nAn exception occurred while executing a query: SQLSTATE[42S22]: Column not found: 1054 Unknown column '_%' in 'where clause'"

@CarlSchwan
Do the filtering on the DB instead
8c95e46
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
PVince81
PVince81 reviewed Oct 13, 2022
View reviewed changes
Comment threadapps/user_status/lib/Db/UserStatusMapper.php Outdated
@PVince81PVince81 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 13, 2022
nickvergessen
nickvergessen requested changes Oct 13, 2022
View reviewed changes
Comment threadapps/user_status/lib/Db/UserStatusMapper.php Outdated
@CarlSchwan@nickvergessen
Properly escape underscore in db query
f8453df
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
@tobiasKaminsky

tobiasKaminsky commented Oct 14, 2022

Copy link
Copy Markdown
MemberAuthor

This works now! Thanks Joas!

@PVince81
PVince81 merged commit 2cef188 into masterOct 14, 2022
@PVince81
PVince81 deleted the filterOutBackupStatus branch October 14, 2022 12:48
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Oct 14, 2022
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@PVince81PVince81PVince81 left review comments
@CarlSchwanCarlSchwanCarlSchwan requested changes
@nickvergessennickvergessennickvergessen approved these changes
@julien-ncjulien-ncjulien-nc approved these changes
+1 more reviewer
@YasinAshorianYasinAshorianYasinAshorian approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: status

Projects

None yet

Milestone

Nextcloud 26

Development

Successfully merging this pull request may close these issues.

[Bug]: Dashboard "recent status": duplicate entry?

8 participants

@tobiasKaminsky@nickvergessen@julien-nc@PVince81@CarlSchwan@github-advanced-security@YasinAshorian@skjnldsv