From 56eb7326ef508a97f940ef30442c783681fe8432 Mon Sep 17 00:00:00 2001 From: P0psicles Date: Mon, 12 Nov 2018 20:43:40 +0100 Subject: [PATCH 1/4] Do not allow to set anime option(s) when adding shows through tmdb or tvmaze. Update changelog. --- CHANGELOG.md | 1 + themes-default/slim/views/addShows_newShow.mako | 8 +++++++- themes/dark/templates/addShows_newShow.mako | 8 +++++++- themes/light/templates/addShows_newShow.mako | 8 +++++++- 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e5a239d19..52cff875e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ #### Improvements - Vueified "config - notifications" page. Improved components: config-textbox, select-list, show-selector, config-textbox-number. Improved responsiveness of the notification page on smaller screens ([#4913](https://github.com/pymedusa/Medusa/pull/4913)) - Allow the use of priorities in the Pushover notifier ([#5567](https://github.com/pymedusa/Medusa/pull/5567)) +- Do not allow to enable the anime options, when using tmdb or tvmaze. ([#xxxx](https://github.com/pymedusa/Medusa/pull/xxxx)) #### Fixes - Fixed test not working for Download Station ([#5561](https://github.com/pymedusa/Medusa/pull/5561)) diff --git a/themes-default/slim/views/addShows_newShow.mako b/themes-default/slim/views/addShows_newShow.mako index bae60935f3..ea87f276e6 100644 --- a/themes-default/slim/views/addShows_newShow.mako +++ b/themes-default/slim/views/addShows_newShow.mako @@ -189,6 +189,12 @@ window.app = new Vue({ if (currentSearch.cancel !== null) return 'searching'; if (!firstSearch || searchStatus !== '') return 'status'; return 'results'; + }, + enableAnimeOptions() { + const { selectedShow } = this; + if (selectedShow && selectedShow.indexerId === 1) { + return true; + } } }, methods: { @@ -609,7 +615,7 @@ window.app = new Vue({
Customize options
- +
diff --git a/themes/dark/templates/addShows_newShow.mako b/themes/dark/templates/addShows_newShow.mako index bae60935f3..ea87f276e6 100644 --- a/themes/dark/templates/addShows_newShow.mako +++ b/themes/dark/templates/addShows_newShow.mako @@ -189,6 +189,12 @@ window.app = new Vue({ if (currentSearch.cancel !== null) return 'searching'; if (!firstSearch || searchStatus !== '') return 'status'; return 'results'; + }, + enableAnimeOptions() { + const { selectedShow } = this; + if (selectedShow && selectedShow.indexerId === 1) { + return true; + } } }, methods: { @@ -609,7 +615,7 @@ window.app = new Vue({
Customize options
- +
diff --git a/themes/light/templates/addShows_newShow.mako b/themes/light/templates/addShows_newShow.mako index bae60935f3..ea87f276e6 100644 --- a/themes/light/templates/addShows_newShow.mako +++ b/themes/light/templates/addShows_newShow.mako @@ -189,6 +189,12 @@ window.app = new Vue({ if (currentSearch.cancel !== null) return 'searching'; if (!firstSearch || searchStatus !== '') return 'status'; return 'results'; + }, + enableAnimeOptions() { + const { selectedShow } = this; + if (selectedShow && selectedShow.indexerId === 1) { + return true; + } } }, methods: { @@ -609,7 +615,7 @@ window.app = new Vue({
Customize options
- +
From e54b1948d9eef66ce4afdd00a23a8d1f97019858 Mon Sep 17 00:00:00 2001 From: P0psicles Date: Mon, 12 Nov 2018 20:45:24 +0100 Subject: [PATCH 2/4] update changelog PR. --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52cff875e0..6748f61255 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ #### Improvements - Vueified "config - notifications" page. Improved components: config-textbox, select-list, show-selector, config-textbox-number. Improved responsiveness of the notification page on smaller screens ([#4913](https://github.com/pymedusa/Medusa/pull/4913)) - Allow the use of priorities in the Pushover notifier ([#5567](https://github.com/pymedusa/Medusa/pull/5567)) -- Do not allow to enable the anime options, when using tmdb or tvmaze. ([#xxxx](https://github.com/pymedusa/Medusa/pull/xxxx)) +- Do not allow to enable the anime options, when using tmdb or tvmaze. ([#5701](https://github.com/pymedusa/Medusa/pull/5701)) #### Fixes - Fixed test not working for Download Station ([#5561](https://github.com/pymedusa/Medusa/pull/5561)) From 484f2c02a3736299873fb533fc665c519118ba2a Mon Sep 17 00:00:00 2001 From: p0ps Date: Wed, 14 Nov 2018 09:21:28 +0100 Subject: [PATCH 3/4] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 407617b528..263f7ad62d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,7 @@ - Allowed the use of priorities in the Pushover notifier ([#5567](https://github.com/pymedusa/Medusa/pull/5567)) - Added delete method to EpisodeHandler (apiv2), for deleting a single episode ([#5685](https://github.com/pymedusa/Medusa/pull/5685)) - Allowed Nyaa and Anidex to search for non-anime shows ([#5680](https://github.com/pymedusa/Medusa/pull/5680) & [#5681](https://github.com/pymedusa/Medusa/pull/5681)) -- Do not allow to enable the anime options, when using tmdb or tvmaze. ([#5701](https://github.com/pymedusa/Medusa/pull/5701)) +- Do not allow to enable the anime options, when using tmdb or tvmaze ([#5701](https://github.com/pymedusa/Medusa/pull/5701)) #### Fixes - Fixed test not working for Download Station ([#5561](https://github.com/pymedusa/Medusa/pull/5561)) From e11beb76aedd8508910a7f3f85f7cbda6f580461 Mon Sep 17 00:00:00 2001 From: P0psicles Date: Wed, 14 Nov 2018 11:06:57 +0100 Subject: [PATCH 4/4] Use v-bind. --- themes-default/slim/views/addShows_newShow.mako | 2 +- themes/dark/templates/addShows_newShow.mako | 2 +- themes/light/templates/addShows_newShow.mako | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/themes-default/slim/views/addShows_newShow.mako b/themes-default/slim/views/addShows_newShow.mako index ea87f276e6..cc54ae5553 100644 --- a/themes-default/slim/views/addShows_newShow.mako +++ b/themes-default/slim/views/addShows_newShow.mako @@ -615,7 +615,7 @@ window.app = new Vue({
Customize options
- +
diff --git a/themes/dark/templates/addShows_newShow.mako b/themes/dark/templates/addShows_newShow.mako index ea87f276e6..cc54ae5553 100644 --- a/themes/dark/templates/addShows_newShow.mako +++ b/themes/dark/templates/addShows_newShow.mako @@ -615,7 +615,7 @@ window.app = new Vue({
Customize options
- +
diff --git a/themes/light/templates/addShows_newShow.mako b/themes/light/templates/addShows_newShow.mako index ea87f276e6..cc54ae5553 100644 --- a/themes/light/templates/addShows_newShow.mako +++ b/themes/light/templates/addShows_newShow.mako @@ -615,7 +615,7 @@ window.app = new Vue({
Customize options
- +