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

Fix encryption alert msg for env var, configuration->conf refactor #948

Merged
merged 1 commit into from
Feb 7, 2016

Conversation

mistercrunch
Copy link
Member

No description provided.

@@ -2099,7 +2099,7 @@ def on_model_change(self, form, model, is_created):

@classmethod
def alert_fernet_key(cls):
return not configuration.has_option('core', 'fernet_key')
return conf.get('core', 'fernet_key') is None
Copy link
Member Author

Choose a reason for hiding this comment

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

This is the actual fix, the rest is just search and replace

Copy link
Contributor

Choose a reason for hiding this comment

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

Cool. I can help test it once you merge it, but looks good to the eye!

Copy link
Contributor

Choose a reason for hiding this comment

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

This fix addresses the problem raised by the reporter in #920, but I've raised some concerns about how we are managing configuration in that issue, which we can fix by providing an easy way to inspect a unified view of the winning configuration in one place.

mistercrunch added a commit that referenced this pull request Feb 7, 2016
Fix encryption alert msg for env var, configuration->conf refactor
@mistercrunch mistercrunch merged commit d2a7cc6 into master Feb 7, 2016
@mistercrunch mistercrunch deleted the fernet branch May 3, 2016 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants