Better handling of public pages and workflows authored by deleted users #19394
+10
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
martenson
reviewed
Jan 10, 2025
lib/galaxy/managers/pages.py
Outdated
| @@ -168,6 +169,10 @@ def index_query( | |||
| stmt = stmt.outerjoin(self.model_class.users_shared_with) | |||
| stmt = stmt.where(or_(*filters)) | |||
|
|
|||
| # Do not include pages authored by deleted users | |||
| if show_published: | |||
| stmt = stmt.join(Page.user).where(and_(User.deleted == false(), User.purged == false())) | |||
There was a problem hiding this comment.
this allows pages by deleted but not purged users, is that intentional?
There was a problem hiding this comment.
I doesn't: it's an inner join, so by joining we end up selecting only those pages that can be joined with user records where the user is both not deleted and not purged. So, for "user (deleted,purged)", if we have u1 (0,0), u2 (0,1), u3 (1,0), and u4(1,1), then only u1 will be joined, so only pages associated with u1 will be selected.
We check for both deleted and purged because their may be older galaxy instances with user records that are purged but not deleted.
jdavcs
force-pushed
the
dev_deleted_users_items
branch
from
3d18f94 to
6611c17
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ref: #19343
to do:
(Please replace this header with a description of your pull request. Please include BOTH what you did and why you made the changes. The "why" may simply be citing a relevant Galaxy issue.)
(If fixing a bug, please add any relevant error or traceback)
(For UI components, it is recommended to include screenshots or screencasts)
How to test the changes?
(Select all options that apply)
License