From c014bebb8c58c60b3e072280b0aca8961fcc3d8c Mon Sep 17 00:00:00 2001
From: JackDandy <jackdandy@users.noreply.github.com>
Date: Tue, 10 Mar 2015 02:29:52 +0000
Subject: [PATCH] Fix issues introduced by adding Anime options to the Add Show
 flow.

Fix error page when clicking "Add Recommended".
Remove failed Anime options from "Add Existing Show".
---
 CHANGES.md                                           | 6 ++++++
 gui/slick/interfaces/default/inc_addShowOptions.tmpl | 8 +++++++-
 sickbeard/webserve.py                                | 6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 619dbd01..2565e38e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,9 @@
+### 0.7.1 (2015-03-10 17:00:00 UTC)
+
+* Fix error page when clicking "Add Recommended"
+* Remove failed Anime options from "Add Existing Show"
+
+
 ### 0.7.0 (2015-03-04 06:00:00 UTC)
 
 * Fix slow database operations (port from midgetspy/sickbeard)
diff --git a/gui/slick/interfaces/default/inc_addShowOptions.tmpl b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
index e3d82c6f..dbbd23ce 100644
--- a/gui/slick/interfaces/default/inc_addShowOptions.tmpl
+++ b/gui/slick/interfaces/default/inc_addShowOptions.tmpl
@@ -59,6 +59,7 @@
 		</div>
 #end if
 
+#if $enable_anime_options
 		<div class="field-pair alt">
 			<label for="anime">
 				<span class="component-title">Show is anime</span>
@@ -69,6 +70,7 @@
 			</label>
 		</div>
 
+#end if
 		<div class="field-pair alt" style="margin-top:20px">
 			<label for="saveDefaultsButton">
 				<span class="component-title">Save options as defaults</span>
@@ -79,5 +81,9 @@
 			</label>
 		</div>
 
+#if $enable_anime_options
 #import sickbeard.blackandwhitelist
-#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl')
\ No newline at end of file
+#include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl')
+#else
+		<input type="hidden" name="anime" id="anime" value="0" />
+#end if
\ No newline at end of file
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 87767f0c..85fc8acf 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -2809,6 +2809,7 @@ class NewHomeAddShows(MainHandler):
 
         t = PageTemplate(headers=self.request.headers, file="home_newShow.tmpl")
         t.submenu = HomeMenu()
+        t.enable_anime_options = True
 
         indexer, show_dir, indexer_id, show_name = self.split_extra_show(show_to_add)
 
@@ -2861,6 +2862,7 @@ class NewHomeAddShows(MainHandler):
 
         t = PageTemplate(headers=self.request.headers, file="home_recommendedShows.tmpl")
         t.submenu = HomeMenu()
+        t.enable_anime_options = False
 
         return _munge(t)
 
@@ -2947,9 +2949,7 @@ class NewHomeAddShows(MainHandler):
         """
         t = PageTemplate(headers=self.request.headers, file="home_addExistingShow.tmpl")
         t.submenu = HomeMenu()
-        t.whitelist = []
-        t.blacklist = []
-        t.groups = []
+        t.enable_anime_options = False
 
         return _munge(t)