From afa16cd656e976fad1ce7451746a4cfc7f5ab912 Mon Sep 17 00:00:00 2001
From: JonnyWong16 <JonnyWong16@users.noreply.github.com>
Date: Sun, 11 Feb 2018 22:48:26 -0800
Subject: [PATCH] Newsletter preview by default

---
 data/interfaces/default/newsletter_config.html  | 2 +-
 data/interfaces/default/newsletter_preview.html | 2 +-
 plexpy/webserve.py                              | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/data/interfaces/default/newsletter_config.html b/data/interfaces/default/newsletter_config.html
index ab56456a..93975c75 100644
--- a/data/interfaces/default/newsletter_config.html
+++ b/data/interfaces/default/newsletter_config.html
@@ -525,7 +525,7 @@
 
     function previewNewsletter() {
         showMsg('<i class="fa fa-check"></i>&nbsp; Check pop-up blocker if no response.', false, true, 2000);
-        window.open('newsletter?newsletter_id=' + $('#newsletter_id').val() + '&preview=true');
+        window.open('newsletter?newsletter_id=' + $('#newsletter_id').val());
     }
 
     function sendTestNewsletter() {
diff --git a/data/interfaces/default/newsletter_preview.html b/data/interfaces/default/newsletter_preview.html
index 83fbf41b..ebabdce8 100644
--- a/data/interfaces/default/newsletter_preview.html
+++ b/data/interfaces/default/newsletter_preview.html
@@ -27,7 +27,7 @@
 <script>
 $(document).ready(function () {
     var frame = $('<iframe></iframe>', {
-        src: 'real_newsletter?newsletter_id=${newsletter_id}&preview=${preview}&master=${master}&raw=${raw}',
+        src: 'real_newsletter?newsletter_id=${newsletter_id}&preview=true',
         frameborder: '0',
         style: 'display: none; height: 100vh; width: 100vw;'
     });
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index de5d5bae..f625e499 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -5490,13 +5490,10 @@ class WebInterface(object):
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))
-    def newsletter(self, newsletter_id=None, preview=False, master=False, raw=False, **kwargs):
+    def newsletter(self, newsletter_id=None, **kwargs):
         return serve_template(templatename="newsletter_preview.html",
                               title="Newsletter",
-                              newsletter_id=newsletter_id,
-                              preview=preview,
-                              master=master,
-                              raw=raw)
+                              newsletter_id=newsletter_id)
 
     @cherrypy.expose
     @requireAuth(member_of("admin"))