Update Tahoe Juniper (main) with Hawthorn changes from develop - #795
Merged
Conversation
Return the first instead to keep from failing outside of Tahoe SaaS when we may have more than one Organization per Site
Use FEATURE setting to enable Honor mode auto-certs Committing Omar's suggestions Co-authored-by: Omar Al-Ithawi <i@omardo.com> Fix settings imports for Tahoe certs signals changes for Honor auto-certs, related tests. Add related default FEATURE setting in appsembler.settings
…rts-for-honor Allow auto-generation of certs (e.g., on passing grade) for Honor mode
github-actions
Bot
requested review from
OmarIthawi,
johnbaldwin,
melvinsoft and
thraxil
December 28, 2020 23:26
tracks static page
…-multiple-site-orgs UNIFICATION: get_current_organization don't assume single Organization
johnbaldwin
reviewed
Jan 4, 2021
|
|
||
|
|
||
| class OrganizationByRequestTestCase(TestCase): | ||
| def setUp(self): |
There was a problem hiding this comment.
@bryanlandia Is it intended that two orgs map to one site and one site is not supposed to have any orgs? If so, it would be really helpful to document what the expectations are for these tests, especially given the state of "M:M sites and orgs yes or no conversation and practice. cc @OmarIthawi @melvinsoft
There was a problem hiding this comment.
@johnbaldwin the original pull request that made this change is #785. We have another related pull request appsembler/edx-organizations#11 . Please add your feedback there.
As for this pull request it'll get whatever there's in appsembler/tahoe/develop let it merged into main.
Update translations (autogenerated message)
PyCharm notified me about this despite we never got this in production.
RedirectMiddleware: redirect function variable unshadow
lms organization middleware to make tiers expiration work in lms
bump django-tiers to v0.2.3 for trial expiration fixes
thraxil
removed their request for review
January 25, 2021 14:07
this seems like an important part of our code to be able to inspect more easily in production.
add honeycomb tracing and context on registration API
thraxil
approved these changes
Feb 3, 2021
- added tests - added order_by parameter - refactored `_get_active_tiers_uuids` to isolate the Tiers import
get_active_sites() to return QuerySet
beeline: fix unhashable type: 'dict'
Use the django_sites_extensions RedirectMiddleware, but if TAHOE_ENABLE_DOMAIN_REDIRECT_MIDDLEWARE enabled (default ON), then insert related middleware classes before that standard redirect class.
committing Omar's suggestion Co-authored-by: Omar Al-Ithawi <i@omardo.com>
…are-to-settings-plugins Move RedirectMiddleware to appsembler.settings plugin
Rework get_lms_link_from_course_key using get_site_for_course @OmarIthawi suggestion Co-authored-by: Omar Al-Ithawi <i@omardo.com> Fix import issue in get_lms_link_for_course_key
…urse-org get_lms_link_from_course_key fallback to LMS base if no Site found
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This is an automated pull request from branch
appsembler/tahoe/develop(Hawthorn) intomain(Juniper).This is meant for making sure all of our Hawthorn changes gets merge into Juniper otherwise Juniper would stall.
If tests passes merge this pull request.
If there are merge conflicts, it needs to be resolved manually in a seperate pull request.