Merge pull request #549 from WebTools-NG/#547-Add-link-to-Library-Map-on-FM-Settings-page

#547 add link to library map on fm settings page
This commit is contained in:
Tommy Mikkelsen 2022-07-25 22:05:02 +02:00 committed by GitHub
commit 32aaa4e953
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 8 deletions

View file

@ -1,5 +1,16 @@
# ![Logo](https://github.com/WebTools-NG/WebTools-NG/blob/master/src/assets/WebTools-48x48.png) WebTools-ng Change log
## V1.0.1 ( Not released yet )
**Note**: In this version, the following is disabled:
* Export to xlsx format ([See #331](https://github.com/WebTools-NG/WebTools-NG/issues/331))
* Photo export
**Changes**:
* [#547 Add link to Library Map on FM Settings page](https://github.com/WebTools-NG/WebTools-NG/issues/547) (New Feature)
## V1.0.0 First Official Release (20220724)
**Note**: In this version, the following is disabled:

View file

@ -1,7 +1,7 @@
{
"name": "webtools-ng",
"productName": "WebTools-NG",
"version": "1.0.0",
"version": "1.0.1",
"description": "WebTools Next Generation 4 Plex",
"author": "dane22 & CPSO",
"license": "MPL-2.0",

View file

@ -520,7 +520,8 @@
"Return": "Save & Return",
"Reset": "Reset to factory standard",
"IgnoreHidden": "Ignore Hidden files/directories on Linux/Mac",
"IgnoreExtras": "Ignore local extras"
"IgnoreExtras": "Ignore local extras",
"NoteLibMap": "Note: * Click here for general settings regarding @:Common.Menu.Sidebar.PMS.LibMapping *"
}
}
},

View file

@ -92,8 +92,6 @@
DateTimeOptions: [ i18n.t("Common.DateTime.Full"), i18n.t("Common.DateTime.Long"), i18n.t("Common.DateTime.Medium"), i18n.t("Common.DateTime.Short")],
DateOption: wtconfig.get('General.DateOption'),
TimeOption: wtconfig.get('General.TimeOption')
};
},
created() {
@ -163,7 +161,6 @@
setNotAvailIndicator: function(){
wtconfig.set('ET.NotAvail', this.NotAvailIndicator)
},
// Update conf file
setPrefs: function(value, name){
log.info(`[SettingsPMS.vue] (setPrefs) - Update prefs for ${name} set to ${value}`);

View file

@ -37,7 +37,7 @@
<!-- Buttons -->
<div id="buttons" class="text-center">
<b-button-group >
<b-button variant="success" class="mr-1" @click="jumpToSettings"> {{ $t('Common.Settings.Return') }} </b-button>
<b-button variant="success" class="mr-1" @click="ReturnToRef"> {{ $t('Common.Settings.Return') }} </b-button>
</b-button-group>
</div>
</div>
@ -84,8 +84,15 @@
},
methods: {
// Return to main Settings
jumpToSettings(){
// Return to main Settings
ReturnToRef()
{
if (this.$route.query.return){
this.$router.push({ name: this.$route.query.return })
}
else {
this.$router.push({ name: 'settingsGlobal' })
}
},
// Update mapped path
pathRowClickHandler: async function( record, index ){

View file

@ -6,7 +6,8 @@
</h2>
<h5>{{ $t(`Modules.PMS.FindMedia.Settings.Description`) }}</h5>
</div>
<b-link id="general" :to="{ path: '/settings/export', query: { return: 'FindMediaSettings' } }">{{ $t("Modules.ET.Settings.Note") }} </b-link>
<b-link id="general" :to="{ path: '/settings/export', query: { return: 'FindMediaSettings' } }">{{ $t("Modules.ET.Settings.Note") }} </b-link> <br>
<b-link id="general" :to="{ path: '/settings/libmapping', query: { return: 'FindMediaSettings' } }">{{ $t("Modules.PMS.FindMedia.Settings.NoteLibMap") }} </b-link>
<p>{{ $t("Modules.PMS.FindMedia.Settings.Note") }}</p>
<br>
<b-input-group id="ExtGrp" :prepend="$t('Modules.PMS.FindMedia.Settings.Ext')" class="mt-3">