This commit is contained in:
@@ -3,6 +3,7 @@ import store from "../store";
|
||||
import roles from "./authorizationroles";
|
||||
import locale from "./locale";
|
||||
import api from "./gzapi";
|
||||
import gzevent from "./eventbus";
|
||||
|
||||
function addNavItem(title, icon, route) {
|
||||
store.commit("addNavItem", {
|
||||
@@ -83,8 +84,13 @@ export default function initialize() {
|
||||
.then(res => {
|
||||
if (res.error) {
|
||||
//In a form this would trigger a bunch of validation or error display code but for here and now:
|
||||
//convert error to human readable string for display
|
||||
alert(api.apiErrorToHumanString(res.error));
|
||||
//convert error to human readable string for display and popup a notification to user
|
||||
var msg = api.apiErrorToHumanString(res.error);
|
||||
store.commit(
|
||||
"logItem",
|
||||
"Initialize::() fetch useroptions -> error" + msg
|
||||
);
|
||||
gzevent.$emit("notify-error", msg);
|
||||
} else {
|
||||
//TODO: also need the other locale settings such as number and date formats etc
|
||||
|
||||
@@ -94,14 +100,18 @@ export default function initialize() {
|
||||
}
|
||||
|
||||
if (res.data.timeZoneOffset != localOffset) {
|
||||
//todo: timezone doesn't match, offer to fix it
|
||||
// alert(
|
||||
// "Time zone offset for this account is set to " +
|
||||
// res.data.timeZoneOffset +
|
||||
// " which doesn't match the local timezone offset of " +
|
||||
// localOffset +
|
||||
// "."
|
||||
// );
|
||||
//TODO: localize message and also actually have a fix for it here
|
||||
//so this should be a confirm prompt but for now will just show it
|
||||
|
||||
//for now just show the message
|
||||
gzevent.$emit(
|
||||
"notify-info",
|
||||
"Time zone offset for this account is set to " +
|
||||
res.data.timeZoneOffset +
|
||||
" which doesn't match the local timezone offset of " +
|
||||
localOffset +
|
||||
". You might want to adjust that under user settings"
|
||||
);
|
||||
}
|
||||
|
||||
//Store offset in locale data
|
||||
|
||||
Reference in New Issue
Block a user