diff --git a/CHANGES.md b/CHANGES.md index e2a1347d..b1363a26 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -33,6 +33,12 @@ * Fix the return flow from calls to the redirect function from executing incorrect code +### 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 @@ #end if +#if $enable_anime_options
+#end if
+#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 + +#end if \ No newline at end of file diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index 69138b17..c4920012 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -2095,6 +2095,7 @@ class NewHomeAddShows(Home): t = PageTemplate(headers=self.request.headers, file='home_newShow.tmpl') t.submenu = self.HomeMenu() + t.enable_anime_options = True indexer, show_dir, indexer_id, show_name = self.split_extra_show(show_to_add) @@ -2147,6 +2148,7 @@ class NewHomeAddShows(Home): t = PageTemplate(headers=self.request.headers, file='home_recommendedShows.tmpl') t.submenu = self.HomeMenu() + t.enable_anime_options = False return t.respond() @@ -2233,9 +2235,7 @@ class NewHomeAddShows(Home): """ t = PageTemplate(headers=self.request.headers, file='home_addExistingShow.tmpl') t.submenu = self.HomeMenu() - t.whitelist = [] - t.blacklist = [] - t.groups = [] + t.enable_anime_options = False return t.respond()