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

Feature/fix config general #7478

Merged
merged 4 commits into from
Dec 12, 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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#### Fixes
- Fixed season pack downloads occurring even if not needed ([#7472](https://github.com/pymedusa/Medusa/pull/7472))
- Fixed changing default indexer language and initial indexer in config-general ([#7478](https://github.com/pymedusa/Medusa/pull/7478))

-----

Expand Down
17 changes: 12 additions & 5 deletions themes-default/slim/src/components/config-general.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@
<fieldset class="component-group-list">

<config-template label-for="show_root_dir" label="Default Indexer Language">
<language-select @update-language="indexerLanguage = $event" ref="indexerLanguage" :language="config.indexerDefaultLanguage" :available="indexers.main.validLanguages.join(',')" class="form-control form-control-inline input-sm" />
<language-select @update-language="config.indexerDefaultLanguage = $event" ref="indexerLanguage"
:language="config.indexerDefaultLanguage" :available="indexers.main.validLanguages.join(',')"
class="form-control form-control-inline input-sm" />
<span>for adding shows and metadata providers</span>
</config-template>

Expand Down Expand Up @@ -590,10 +592,15 @@ export default {
...mapGetters([
'getStatus'
]),
indexerDefault() {
const { config } = this;
const { indexerDefault } = config;
return indexerDefault || 0;
indexerDefault: {
get() {
const { config } = this;
const { indexerDefault } = config;
return indexerDefault || 0;
},
set(indexer) {
this.config.indexerDefault = indexer;
}
},
indexerListOptions() {
const { indexers } = this;
Expand Down
6 changes: 6 additions & 0 deletions themes-default/slim/src/components/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ export default {
});
}
},
beforeMount() {
// Wait for the next tick, so the component is rendered
this.$nextTick(() => {
$('#showTabs').tabs();
});
},
mounted() {
const { config, stateLayout, setConfig } = this;
// Resets the tables sorting, needed as we only use a single call for both tables in tablesorter
Expand Down
6 changes: 3 additions & 3 deletions themes/dark/assets/js/medusa-runtime.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions themes/light/assets/js/medusa-runtime.js

Large diffs are not rendered by default.