Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not allow to set anime option(s) when adding shows through tmdb or… #5701

Merged
merged 6 commits into from
Nov 14, 2018
Merged

Do not allow to set anime option(s) when adding shows through tmdb or… #5701

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56eb732
Do not allow to set anime option(s) when adding shows through tmdb or…
p0psicles Nov 12, 2018
e54b194
update changelog PR.
p0psicles Nov 12, 2018
93c7e9e
Merge branch 'develop' into feature/disable-anime-options-non-tvdb
p0psicles Nov 14, 2018
484f2c0
Update CHANGELOG.md
p0psicles Nov 14, 2018
e11beb7
Use v-bind.
p0psicles Nov 14, 2018
e8a4c59
Merge branch 'feature/disable-anime-options-non-tvdb' of https://gith…
p0psicles Nov 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +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))

#### Fixes
- Fixed test not working for Download Station ([#5561](https://github.com/pymedusa/Medusa/pull/5561))
Expand Down
8 changes: 7 additions & 1 deletion themes-default/slim/views/addShows_newShow.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -609,7 +615,7 @@ window.app = new Vue({
<fieldset class="sectionwrap">
<legend class="legendStep">Customize options</legend>
<div class="stepDiv">
<add-show-options :show-name="showName" enable-anime-options @change="updateOptions" @refresh="refreshOptionStep"></add-show-options>
<add-show-options :show-name="showName" :enable-anime-options="enableAnimeOptions" @change="updateOptions" @refresh="refreshOptionStep"></add-show-options>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use v-bind for the ones with the same name.

</div>
</fieldset>
</form>
Expand Down
8 changes: 7 additions & 1 deletion themes/dark/templates/addShows_newShow.mako
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion themes/light/templates/addShows_newShow.mako
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.