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.

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

Add medusa and xem season exceptions icons for each season header. #7360

Merged
merged 2 commits into from
Nov 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#### Fixes
- Fixed broken TheTVDB caused by API v3 changes ([#7355](https://github.com/pymedusa/Medusa/pull/7355))
- DisplayShow: Fixed Xem and Medusa season exceptions not shown anymore ([#7360](https://github.com/pymedusa/Medusa/pull/7360))

-----

Expand Down
14 changes: 6 additions & 8 deletions themes-default/slim/src/components/display-show.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@
<h3 class="season-header toggle collapse"><app-link :name="'season-'+ props.row.season" />
{{ props.row.season > 0 ? 'Season ' + props.row.season : 'Specials' }}
<!-- Only show the search manual season search, when any of the episodes in it is not unaired -->
<app-link v-if="anyEpisodeNotUnaired(props.row)" class="epManualSearch" :href="'home/snatchSelection?indexername=' + show.indexer + '&seriesid=' + show.id[show.indexer] + '&amp;season=' + props.row.season + '&amp;episode=1&amp;manual_search_type=season'">
<app-link v-if="anyEpisodeNotUnaired(props.row)" class="epManualSearch" :href="`home/snatchSelection?indexername=${show.indexer}&seriesid=${show.id[show.indexer]}&amp;season=${props.row.season}&amp;episode=1&amp;manual_search_type=season`">
<img v-if="config" data-ep-manual-search src="images/manualsearch-white.png" width="16" height="16" alt="search" title="Manual Search">
</app-link>
<div class="season-scene-exception" :data-season="props.row.season > 0 ? props.row.season : 'Specials'" />
<img v-bind="getSeasonExceptions(props.row.season)">
</h3>
</template>

Expand Down Expand Up @@ -536,9 +537,6 @@ export default {

setAbsoluteSceneNumbering(forAbsolute, sceneAbsolute);
});

// Get the season exceptions and the xem season mappings.
// getSeasonSceneExceptions();
},
methods: {
humanFileSize,
Expand Down Expand Up @@ -947,15 +945,15 @@ export default {
}

// Check if there is a season exception for this season
if (allSceneExceptions[season]) {
if (allSceneExceptions.find(x => x.season === season)) {
// If there is not a match on the xem table, display it as a medusa scene exception
bindData = {
id: `xem-exception-season-${foundInXem ? xemSeasons[0] : season}`,
alt: foundInXem ? '[xem]' : '[medusa]',
src: foundInXem ? 'images/xem.png' : 'images/ico/favicon-16.png',
title: xemSeasons.reduce((a, b) => {
return a.concat(allSceneExceptions[b]);
}, []).join(', ')
title: foundInXem ? xemSeasons.reduce((a, b) => {
return a.concat(allSceneExceptions.find(x => x.season === b).exceptions);
}, []).join(', ') : allSceneExceptions.find(x => x.season === season).exceptions.join(', ')
};
}

Expand Down
4 changes: 2 additions & 2 deletions themes/dark/assets/js/medusa-runtime.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions themes/light/assets/js/medusa-runtime.js

Large diffs are not rendered by default.