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.

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

Hardcode user model to avoid conflict with other kolibri usages #11531

Merged

Conversation

jredrejo
Copy link
Member

Summary

Migration kolibri/core/device/migrations/0019_syncqueue_and_status.py is using a setting variable settings.AUTH_USER_MODEL to refer to kolibri.core.auth.models.FacilityUser.
This is causing problem in other usages where settings.AUTH_USER_MODEL is a different model

This PR uses the real model name to avoid problems

Reviewer guidance

Tested in KDP where settings.AUTH_USER_MODEL=kolibri_data_portal.PortalUser
do migrations run correctly?

Testing checklist

  • Contributor has fully tested the PR manually
  • If there are any front-end changes, before/after screenshots are included
  • Critical user journeys are covered by Gherkin stories
  • Critical and brittle code paths are covered by unit tests

PR process

  • PR has the correct target branch and milestone
  • PR has 'needs review' or 'work-in-progress' label
  • If PR is ready for review, a reviewer has been added. (Don't use 'Assignees')
  • If this is an important user-facing change, PR or related issue has a 'changelog' label
  • If this includes an internal dependency change, a link to the diff is provided

Reviewer checklist

  • Automated test coverage is satisfactory
  • PR is fully functional
  • PR has been tested for accessibility regressions
  • External dependency files were updated if necessary (yarn and pip)
  • Documentation is updated
  • Contributor is in AUTHORS.md

@jredrejo jredrejo added the TODO: needs review Waiting for review label Nov 14, 2023
@github-actions github-actions bot added DEV: backend Python, databases, networking, filesystem... SIZE: very small labels Nov 14, 2023
Copy link
Member

@rtibbles rtibbles left a comment

Choose a reason for hiding this comment

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

As long as tests pass - this should be fine!

@jredrejo jredrejo merged commit 05b93f4 into learningequality:release-v0.16.x Nov 15, 2023
34 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
DEV: backend Python, databases, networking, filesystem... SIZE: very small TODO: needs review Waiting for review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants