From 9c39360a6f782dfc618a6db9b21bb876acafb05a Mon Sep 17 00:00:00 2001 From: h3llrais3r Date: Sun, 7 Jan 2018 20:42:21 +0100 Subject: [PATCH] Show anime checkbox when adding existing shows (#3568) * Show anime checkbox when adding existing shows * Fix adding existing show with prompt for settings * Fix javascript equal check --- medusa/server/web/home/add_shows.py | 4 ++-- static/js/add-shows/add-existing-show.js | 3 +++ static/js/add-shows/new-show.js | 2 +- views/addShows_addExistingShow.mako | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/medusa/server/web/home/add_shows.py b/medusa/server/web/home/add_shows.py index 0595eb4f77..f031e08ce5 100644 --- a/medusa/server/web/home/add_shows.py +++ b/medusa/server/web/home/add_shows.py @@ -362,8 +362,8 @@ def existingShows(self): Prints out the page to add existing shows from a root dir """ t = PageTemplate(rh=self, filename='addShows_addExistingShow.mako') - return t.render(enable_anime_options=False, title='Existing Show', - header='Existing Show', topmenu='home', + return t.render(enable_anime_options=True, blacklist=[], whitelist=[], groups=[], + title='Existing Show', header='Existing Show', topmenu='home', controller='addShows', action='addExistingShow') def addShowByID(self, indexer_id, show_name=None, indexer="TVDB", which_series=None, diff --git a/static/js/add-shows/add-existing-show.js b/static/js/add-shows/add-existing-show.js index 09b7c95757..1000161623 100644 --- a/static/js/add-shows/add-existing-show.js +++ b/static/js/add-shows/add-existing-show.js @@ -1,4 +1,7 @@ MEDUSA.addShows.addExistingShow = function() { + // Hide the black/whitelist, because it can only be used for a single anime show + $.updateBlackWhiteList(undefined); + $('#tableDiv').on('click', '#checkAll', function() { var seasonCheck = this; $('.dirCheck').each(function() { diff --git a/static/js/add-shows/new-show.js b/static/js/add-shows/new-show.js index e3907ce4cd..7a973f21d7 100644 --- a/static/js/add-shows/new-show.js +++ b/static/js/add-shows/new-show.js @@ -150,7 +150,7 @@ MEDUSA.addShows.newShow = function() { $('#addShowButton').click(function() { // if they haven't picked a show don't let them submit - if (!$('input:radio[name="whichSeries"]:checked').val() && $('input:hidden[name="whichSeries"]').val().length !== 0) { + if (!$('input:radio[name="whichSeries"]:checked').val() && $('input:hidden[name="whichSeries"]').val().length === 0) { alert('You must choose a show to continue'); // eslint-disable-line no-alert return false; } diff --git a/views/addShows_addExistingShow.mako b/views/addShows_addExistingShow.mako index bca57aabcf..0440d6b263 100644 --- a/views/addShows_addExistingShow.mako +++ b/views/addShows_addExistingShow.mako @@ -17,7 +17,7 @@ ## @TODO: Fix this stupid hack
-
+