chore: fix get_default_site function of Enterprise Customer admin page #1798
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
johnnagro
suggested changes
Jul 12, 2023
enterprise/models.py
Outdated
| In production, it should be 'courses.edx.org'. | ||
| In stage it should be 'courses.stage.edx.org'. | ||
| """ | ||
| ENVIRONMENT = os.getenv('DJANGO_ENVIRONMENT', 'development') |
There was a problem hiding this comment.
rather than hard-coding the options here, we should add a configuration setting and/or reuse an existing one such as LMS_BASE
That way is more flexible - it can run in any environment (devstack, hosted devstack, sandboxes, etc) where the domains might vary widely, as well as any opensource community install.
yuanyuan-git-tech
force-pushed
the
yuanyuan/ent-7322
branch
from
9f51093
to
8042296
Compare
| ('enterprise', '0176_auto_20230712_1751'), | ||
| ] | ||
|
|
||
| operations = [ |
There was a problem hiding this comment.
is there a reason why these changes are in a second migration file?
| @@ -157,6 +157,18 @@ def get_default_customer_type(): | |||
| return enterprise_customer_type.id | |||
|
|
|||
|
|
|||
| def get_default_site(): | |||
enterprise/models.py
Outdated
| @@ -223,41 +238,44 @@ class Meta: | |||
| ) | |||
|
|
|||
| enable_data_sharing_consent = models.BooleanField( | |||
| "Activate data sharing consent prompt", | |||
There was a problem hiding this comment.
it wasn't clear to me that this param is intended as the verbose_name, could we add the named param to this and the other fields below that include verbose names?
yuanyuan-git-tech
force-pushed
the
yuanyuan/ent-7322
branch
from
e70c26d
to
751a3bb
Compare
alex-sheehan-edx
approved these changes
Jul 20, 2023
yuanyuan-git-tech
force-pushed
the
yuanyuan/ent-7322
branch
from
d9c898a
to
330488b
Compare
johnnagro
approved these changes
Jul 21, 2023
yuanyuan-git-tech
force-pushed
the
yuanyuan/ent-7322
branch
from
1c7c6a5
to
94f8631
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.
https://2u-internal.atlassian.net/browse/ENT-7322
Merge checklist:
requirements/*.txtfiles)base.inif needed in production but edx-platform doesn't install ittest-master.inif edx-platform pins it, with a matching versionmake upgrade && make requirementshave been run to regenerate requirementsmake statichas been run to update webpack bundling if any static content was updated./manage.py makemigrationshas been run./manage.py lms makemigrationsin the shell.Post merge:
(so basically once your build finishes, after maybe a minute you should see the new version in PyPi automatically (on refresh))
make upgradein edx-platform will look for the latest version in PyPi.