anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix email config for newsletters

Browse Source
This commit is contained in:
JonnyWong16
2018-03-20 10:07:06 -07:00
parent 5b1ff402bc
commit b712874ed2
3 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
plexpy/newsletters.py
View File

@@ -209,7 +209,7 @@ def set_newsletter_config(newsletter_id=None, agent_id=None, **kwargs):
return False
config_prefix = agent['name'] + '_'
email_config_prefix = 'email_'
email_config_prefix = 'newsletter_email_'
newsletter_config = {k[len(config_prefix):]: kwargs.pop(k)
for k in kwargs.keys() if k.startswith(config_prefix)}
@@ -350,7 +350,11 @@ class Newsletter(object):
if isinstance(v, int):
new_config[k] = helpers.cast_to_int(config.get(k, v))
elif isinstance(v, list):
new_config[k] = list(config.get(k, v))
c = config.get(k, v)
if not isinstance(c, list):
new_config[k] = [c]
else:
new_config[k] = c
else:
new_config[k] = config.get(k, v)
@@ -489,7 +493,10 @@ class Newsletter(object):
return config_options
def return_email_config_options(self):
return EMAIL(self.email_config).return_config_options()
config_options = EMAIL(self.email_config).return_config_options()
for c in config_options:
c['name'] = 'newsletter_' + c['name']
return config_options
class RecentlyAdded(Newsletter):