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

Switch to header styles for newsletter template

Browse Source
This commit is contained in:
JonnyWong16
2018-05-11 18:27:31 -07:00
parent 8185cc1c40
commit 7f2bab3082
4 changed files with 268 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plexpy/newsletters.py
View File

@@ -319,7 +319,6 @@ class Newsletter(object):
_DEFAULT_BODY = 'View the newsletter here: {newsletter_url}'
_DEFAULT_MESSAGE = ''
_DEFAULT_FILENAME = 'newsletter_{newsletter_uuid}.html'
_TEMPLATE_MASTER = ''
_TEMPLATE = ''
def __init__(self, newsletter_id=None, newsletter_id_name=None, config=None, email_config=None,
@@ -412,19 +411,14 @@ class Newsletter(object):
'parameters': self.parameters,
'data': self.data}
def generate_newsletter(self, preview=False, master=False):
def generate_newsletter(self, preview=False):
if preview:
self.is_preview = True
if master:
template = self._TEMPLATE_MASTER
else:
template = self._TEMPLATE
self.retrieve_data()
return serve_template(
templatename=template,
templatename=self._TEMPLATE,
uuid=self.uuid,
subject=self.subject_formatted,
body=self.body_formatted,

5
plexpy/webserve.py
View File

@@ -5766,7 +5766,7 @@ class WebInterface(object):
@cherrypy.expose
@requireAuth(member_of("admin"))
def real_newsletter(self, newsletter_id=None, start_date=None, end_date=None,
preview=False, master=False, raw=False, **kwargs):
preview=False, raw=False, **kwargs):
if newsletter_id and newsletter_id != 'None':
newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
@@ -5781,14 +5781,13 @@ class WebInterface(object):
body=newsletter['body'],
message=newsletter['message'])
preview = (preview == 'true')
master = (master == 'true')
raw = (raw == 'true')
if raw:
cherrypy.response.headers['Content-Type'] = 'application/json;charset=UTF-8'
return json.dumps(newsletter_agent.raw_data(preview=preview))
return newsletter_agent.generate_newsletter(preview=preview, master=master)
return newsletter_agent.generate_newsletter(preview=preview)
logger.error(u"Failed to retrieve newsletter: Invalid newsletter_id %s" % newsletter_id)
return "Failed to retrieve newsletter: invalid newsletter_id parameter"