admin/raven-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-07-23 19:13:38 +00:00
parent 8a713c2b1f
commit 1261116f1e
12 changed files with 81 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ayanova/src/views/ay-history.vue
View File

@@ -291,7 +291,7 @@ export default {
let currentEventCount = vm.obj.length;
let timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
let languageName = window.$gz.locale.getBrowserLanguages();
let hour12 = window.$gz.store.state.locale.hour12;
let hour12 = window.$gz.store.state.userOptions.hour12;
for (let i = 0; i < temp.length; i++) {
temp[i].date = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
temp[i].date,

2
ayanova/src/views/home-notifications.vue
View File

@@ -160,7 +160,7 @@ export default {
let timeZoneName = window.$gz.locale.getBrowserTimeZoneName();
let languageName = window.$gz.locale.getBrowserLanguages();
let hour12 = window.$gz.store.state.locale.hour12;
let hour12 = window.$gz.store.state.userOptions.hour12;
for (let i = 0; i < temp.length; i++) {
temp[
i

2
ayanova/src/views/home-notify-subscription.vue
View File

@@ -175,6 +175,8 @@ export default {
await vm.getDataFromApi(vm.$route.params.recordid); //let getdata handle loading
}
} else {
//default to their configured email address on new record
this.obj.deliveryAddress = this.$store.state.userOptions.emailAddress;
vm.formState.loading = false; //here we handle it immediately
}
//set initial form status

11
ayanova/src/views/home-user-settings.vue
View File

@@ -316,7 +316,7 @@ export default {
});
//Set values in store so they are updated immediately for user
let l = vm.$store.state.locale;
let l = vm.$store.state.userOptions;
if (vm.obj.languageOverride) {
l.languageOverride = vm.obj.languageOverride;
@@ -334,7 +334,14 @@ export default {
l.hour12 = vm.obj.hour12;
}
window.$gz.store.commit("setLocale", l);
if (vm.obj.uiColor) {
l.uiColor = vm.obj.uiColor;
}
if (vm.obj.emailAddress) {
l.emailAddress = vm.obj.emailAddress;
}
window.$gz.store.commit("setUserOptions", l);
if (
vm.activeTranslationId &&

31
ayanova/src/views/ops-server-state.vue
View File

@@ -180,26 +180,27 @@ export default {
dirty: false
});
//Set values in store so they are updated immediately for user
let l = vm.$store.state.locale;
//why is this crap here, copied over from user settings form I guess , remove
// //Set values in store so they are updated immediately for user
// let l = vm.$store.state.userOptions;
if (vm.obj.languageOverride) {
l.languageOverride = vm.obj.languageOverride;
}
// if (vm.obj.languageOverride) {
// l.languageOverride = vm.obj.languageOverride;
// }
if (vm.obj.timeZoneOverride) {
l.timeZoneOverride = vm.obj.timeZoneOverride;
}
// if (vm.obj.timeZoneOverride) {
// l.timeZoneOverride = vm.obj.timeZoneOverride;
// }
if (vm.obj.currencyName) {
l.currencyName = vm.obj.currencyName;
}
// if (vm.obj.currencyName) {
// l.currencyName = vm.obj.currencyName;
// }
if (vm.obj.hour12) {
l.hour12 = vm.obj.hour12;
}
// if (vm.obj.hour12) {
// l.hour12 = vm.obj.hour12;
// }
window.$gz.store.commit("setLocale", l);
// window.$gz.store.commit("setUserOptions", l);
}
} catch (error) {
vm.formState.loading = false;