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 project usersWithActiveTasks query #5115

Merged
merged 3 commits into from
Feb 1, 2021
Merged

Fix project usersWithActiveTasks query #5115

merged 3 commits into from
Feb 1, 2021

Conversation

fm3
Copy link
Member

@fm3 fm3 commented Feb 1, 2021 •
edited
Loading

URL of deployed dev instance (used for testing):

  • https://___.webknossos.xyz

Steps to test:

  • Create second user (member of organization team), give them sampleExp:1, create task
  • Log in as that user, fetch the task
  • In Admin Project view, “Show active users” modal should list the user with the open task, not crash

Issues:

@fm3 fm3 self-assigned this Feb 1, 2021
@fm3 fm3 marked this pull request as ready for review February 1, 2021 10:26
@fm3 fm3 requested a review from philippotto February 1, 2021 10:26
philippotto
philippotto approved these changes Feb 1, 2021
View reviewed changes
Copy link
Member

@philippotto philippotto left a comment

Choose a reason for hiding this comment

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

Change looks good and the test plan, too 👍 Didn't test myself, though.

@bulldozer-boy bulldozer-boy bot merged commit ea49034 into master Feb 1, 2021
@bulldozer-boy bulldozer-boy bot deleted the user-email-complex-query branch February 1, 2021 10:50
philippotto pushed a commit that referenced this pull request Feb 3, 2021
@fm3 @philippotto
Cherry-pick "Fix project usersWithActiveTasks query (#5115)" and create
82028d4 
21.02.1 release

* Fix project usersWithActiveTasks query
* changelog
* Merge branch 'master' into user-email-complex-query
@philippotto philippotto mentioned this pull request Feb 3, 2021
Merged
6 tasks
bulldozer-boy bot pushed a commit that referenced this pull request Feb 3, 2021
@philippotto
Hotfix release 21.02.1 (#5126)
4f66993 
* Cherry-pick "Fix project usersWithActiveTasks query (#5115)" and create
21.02.1 release

* Fix project usersWithActiveTasks query
* changelog
* Merge branch 'master' into user-email-complex-query
* Merge branch 'master' of github.com:scalableminds/webknossos into release-21.02.1
* also update migrations.md with empty migration section
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@philippotto philippotto philippotto approved these changes

Assignees

@fm3 fm3

Labels
automerge backend bug
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Complex query still use user.email (was moved to multiUser)
2 participants
@fm3 @philippotto