Skip to content

Add new setting to cms project #645

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

Merged
chrisndodge merged 3 commits into from
Aug 12, 2013
Merged

Add new setting to cms project #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0da2fb8
Add new setting to cms project
Aug 12, 2013
0231e64
also define TECH_SUPPORT_EMAIL in cms.envs.common config file
Aug 12, 2013
7fd5a00
import default TECH_SUPPORT_EMAIL setting from LMS
Aug 12, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cms/envs/aws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
ADMINS = ENV_TOKENS.get('ADMINS', ADMINS)
SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL)
MKTG_URLS = ENV_TOKENS.get('MKTG_URLS', MKTG_URLS)
TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL)

@adampalay adampalay Aug 12, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

TECH_SUPPORT_EMAIL isn't defined in cms.envs.aws or cms.envs.common; it's in lms.envs.common. I would add TECH_SUPPORT_EMAIL to the things you already import from lms.envs.common into cms.envs.common

@chrisndodge chrisndodge Aug 12, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

That's what I'm not clearly understanding. In cms/envs/common.py we have:

import lms.envs.common

Shouldn't that pick up the TECH_SUPPORT_EMAIL setting?

@chrisndodge chrisndodge Aug 12, 2013

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Added explicit definition in cms/envs/common.py

@adampalay adampalay Aug 12, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

actually not, you'd either have to specify "lms.envs.common.TECH_SUPPORT_EMAIL" or say "from lms.envs.common import TECH_SUPPORT_EMAIL". Importing a module doesn't add its namespace to your current one; you do that with the "from import " syntax.

Of course explicit definitions work too!

@adampalay adampalay Aug 12, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

probably cleanest to change cms/envs/dev line 29 to "from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL".


COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", [])

Expand Down
2 changes: 1 addition & 1 deletion cms/envs/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

import sys
import lms.envs.common
from lms.envs.common import USE_TZ
from lms.envs.common import USE_TZ, TECH_SUPPORT_EMAIL
from path import path

############################ FEATURE CONFIGURATION #############################
Expand Down