mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-07-10 23:42:37 -07:00
View sent newsletters without authentication
This commit is contained in:
parent
8d25b0c973
commit
1474f144fe
2 changed files with 15 additions and 17 deletions
|
@ -27,11 +27,7 @@
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function () {
|
$(document).ready(function () {
|
||||||
var frame = $('<iframe></iframe>', {
|
var frame = $('<iframe></iframe>', {
|
||||||
% if newsletter_uuid:
|
|
||||||
src: '${http_root}real_newsletter?newsletter_uuid=${newsletter_uuid}',
|
|
||||||
% else:
|
|
||||||
src: '${http_root}real_newsletter?newsletter_id=${newsletter_id}&preview=true',
|
src: '${http_root}real_newsletter?newsletter_id=${newsletter_id}&preview=true',
|
||||||
% endif
|
|
||||||
frameborder: '0',
|
frameborder: '0',
|
||||||
style: 'display: none; height: 100vh; width: 100vw;'
|
style: 'display: none; height: 100vh; width: 100vw;'
|
||||||
});
|
});
|
||||||
|
|
|
@ -5599,23 +5599,25 @@ class WebInterface(object):
|
||||||
return "No newsletter id received."
|
return "No newsletter id received."
|
||||||
|
|
||||||
@cherrypy.expose
|
@cherrypy.expose
|
||||||
@requireAuth(member_of("admin"))
|
|
||||||
def newsletter(self, *args, **kwargs):
|
def newsletter(self, *args, **kwargs):
|
||||||
newsletter_uuid = args[0] if args else None
|
if args:
|
||||||
newsletter_id = kwargs.pop('newsletter_id', None)
|
newsletter_uuid = args[0]
|
||||||
return serve_template(templatename="newsletter_preview.html",
|
|
||||||
title="Newsletter",
|
|
||||||
newsletter_id=newsletter_id,
|
|
||||||
newsletter_uuid=newsletter_uuid)
|
|
||||||
|
|
||||||
@cherrypy.expose
|
|
||||||
@requireAuth(member_of("admin"))
|
|
||||||
def real_newsletter(self, newsletter_id=None, newsletter_uuid=None, start_date=None, end_date=None,
|
|
||||||
preview=False, master=False, raw=False, **kwargs):
|
|
||||||
if newsletter_uuid:
|
|
||||||
newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid)
|
newsletter = newsletter_handler.get_newsletter(newsletter_uuid=newsletter_uuid)
|
||||||
return newsletter
|
return newsletter
|
||||||
|
|
||||||
|
return self._newsletter(**kwargs)
|
||||||
|
|
||||||
|
@cherrypy.expose
|
||||||
|
@requireAuth(member_of("admin"))
|
||||||
|
def _newsletter(self, newsletter_id=None, **kwargs):
|
||||||
|
return serve_template(templatename="newsletter_preview.html",
|
||||||
|
title="Newsletter",
|
||||||
|
newsletter_id=newsletter_id)
|
||||||
|
|
||||||
|
@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):
|
||||||
if newsletter_id and newsletter_id != 'None':
|
if newsletter_id and newsletter_id != 'None':
|
||||||
newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
|
newsletter = newsletters.get_newsletter_config(newsletter_id=newsletter_id)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue