From fafc972f31cde052b318988965154c71e859066a Mon Sep 17 00:00:00 2001 From: JackDandy Date: Fri, 17 Jul 2015 00:09:27 +0100 Subject: [PATCH] Fix edit on show page for shows that have anime enabled in mass edit. Change to only show option "End upgrade on first match" on edit show page if quality custom is selected. Change label "Show is grouped in" in edit show page to "Show is in group" and move the section higher. --- CHANGES.md | 3 ++ gui/slick/interfaces/default/editShow.tmpl | 30 +++++++++---------- .../default/inc_qualityChooser.tmpl | 2 +- gui/slick/js/qualityChooser.js | 2 +- sickbeard/webserve.py | 2 ++ 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 9102c5d4..38c55338 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -101,6 +101,9 @@ * Change to make pushbullet error messages clearer * Change pyNMA use of urllib to requests (ref:hacks.txt) * Change Trakt url to fix baseline uses (e.g. add from trending) +* Fix edit on show page for shows that have anime enabled in mass edit +* Change to only show option "End upgrade on first match" on edit show page if quality custom is selected +* Change label "Show is grouped in" in edit show page to "Show is in group" and move the section higher [develop changelog] * Update Requests library 2.7.0 (ab1f493) to 2.7.0 (8b5e457) diff --git a/gui/slick/interfaces/default/editShow.tmpl b/gui/slick/interfaces/default/editShow.tmpl index b78ecee5..3e309bf5 100644 --- a/gui/slick/interfaces/default/editShow.tmpl +++ b/gui/slick/interfaces/default/editShow.tmpl @@ -82,7 +82,7 @@ #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_qualityChooser.tmpl') #if $anyQualities + $bestQualities -
+
+
+ +
+
-
- -
- #if $show.is_anime: #import sickbeard.blackandwhitelist #include $os.path.join($sickbeard.PROG_DIR, 'gui/slick/interfaces/default/inc_blackwhitelist.tmpl') diff --git a/gui/slick/interfaces/default/inc_qualityChooser.tmpl b/gui/slick/interfaces/default/inc_qualityChooser.tmpl index 103a89f5..de89291b 100644 --- a/gui/slick/interfaces/default/inc_qualityChooser.tmpl +++ b/gui/slick/interfaces/default/inc_qualityChooser.tmpl @@ -19,7 +19,7 @@
-
+

An Initial quality episode must be found before an Upgrade to selection is considered.

diff --git a/gui/slick/js/qualityChooser.js b/gui/slick/js/qualityChooser.js index 866f2d1b..095e225f 100644 --- a/gui/slick/js/qualityChooser.js +++ b/gui/slick/js/qualityChooser.js @@ -1,5 +1,5 @@ function setFromPresets (preset) { - var elCustomQuality = $('#customQuality'), + var elCustomQuality = $('.show-if-quality-custom'), selected = 'selected'; if (0 == preset) { elCustomQuality.show(); diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index b7d8c0ec..f003940d 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -1247,6 +1247,8 @@ class Home(MainHandler): t.submenu = self.HomeMenu() if showObj.is_anime: + if not showObj.release_groups: + showObj.release_groups = BlackAndWhiteList(showObj.indexerid) t.whitelist = showObj.release_groups.whitelist t.blacklist = showObj.release_groups.blacklist