This commit is contained in:
@@ -17,8 +17,9 @@ export default {
|
||||
DEPRECATED_REUSELATER_15: 15,
|
||||
DEPRECATED_REUSELATER_16: 16,
|
||||
FileAttachment: 17,
|
||||
DataFilter: 18,
|
||||
FormCustom: 19
|
||||
DataListSortFilter: 18,
|
||||
FormCustom: 19,
|
||||
DataListTemplate: 20
|
||||
};
|
||||
/**
|
||||
*
|
||||
|
||||
@@ -45,6 +45,10 @@ function dealWithError(msg, vm) {
|
||||
}
|
||||
}
|
||||
vm.formState.appError = msg;
|
||||
|
||||
//TODO: What is this doing exactly?
|
||||
//it's related to server errors but I'm setting appError above
|
||||
//why two error properties?
|
||||
window.$gz.form.setErrorBoxErrors(vm);
|
||||
}
|
||||
}
|
||||
@@ -101,12 +105,14 @@ export default {
|
||||
// Localize, log and return error
|
||||
//
|
||||
handleFormError(err, vm) {
|
||||
//called inside forms when things go wrong
|
||||
//called inside forms when things go unexpectedly wrong
|
||||
//returns the localized message in case the form wants to display it as well
|
||||
if (err instanceof Error && err.message) {
|
||||
dealWithError(err.message, vm);
|
||||
} else {
|
||||
dealWithError(err.toString(), vm);
|
||||
//TODO: this is pretty bad
|
||||
var msg = JSON.stringify(err);
|
||||
dealWithError(msg, vm);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -110,6 +110,12 @@ export default {
|
||||
return Promise.reject(new Error("[ErrorUserNotAuthorized]"));
|
||||
}
|
||||
|
||||
//404 not found is an expected status not worth logging allow to bubble up
|
||||
//for client code to deal with
|
||||
if (response.status == 404) {
|
||||
return Promise.resolve(response);
|
||||
}
|
||||
|
||||
if (response.status >= 200 && response.status < 300) {
|
||||
return Promise.resolve(response);
|
||||
} else {
|
||||
@@ -289,6 +295,7 @@ export default {
|
||||
// console.log("gzapi::get->Calling resolve now for " + route);
|
||||
// resolve(response); // (**)
|
||||
// }, 2000);
|
||||
|
||||
resolve(response);
|
||||
})
|
||||
.catch(function handleGetError(error) {
|
||||
|
||||
@@ -131,7 +131,7 @@ function getErrorBoxErrors(vm, errs) {
|
||||
//any application errors?
|
||||
if (vm.formState.appError) {
|
||||
hasErrors = true;
|
||||
ret = vm.formState.appError + "\r\n----------\r\n" + ret;
|
||||
ret += vm.formState.appError + "\r\n----------\r\n" + ret;
|
||||
}
|
||||
|
||||
if (!hasErrors) {
|
||||
|
||||
Reference in New Issue
Block a user