Skip to content
Snippets Groups Projects
Commit af642ef1 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

better error message

parent fc9ecb5f
No related branches found
No related tags found
No related merge requests found
......@@ -2919,6 +2919,24 @@
<entry>
<key>${ATTRIBUTE_VOID}</key>
</entry>
<entry>
<key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
</entry>
<entry>
<key>file '%0' cannot be read</key>
</entry>
<entry>
<key>Importer</key>
</entry>
<entry>
<key>yyyy-MM-dd HH:mm:ss</key>
</entry>
<entry>
<key>file '%0' does not exist or you have got no permission on this file</key>
</entry>
<entry>
<key>Zip</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
......
......@@ -3738,6 +3738,25 @@
<entry>
<key>MyTasks</key>
</entry>
<entry>
<key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
<value>Webservice nicht erreichbar. URL: %0 %1</value>
</entry>
<entry>
<key>file '%0' cannot be read</key>
</entry>
<entry>
<key>Importer</key>
</entry>
<entry>
<key>yyyy-MM-dd HH:mm:ss</key>
</entry>
<entry>
<key>file '%0' does not exist or you have got no permission on this file</key>
</entry>
<entry>
<key>Zip</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
......@@ -2952,6 +2952,25 @@
<key>${ATTRIBUTE_VOID}</key>
<value>Void</value>
</entry>
<entry>
<key>${WEBSERVICE_ERROR} url:%0 status:%1</key>
<value>Webservice not available. URL: %0 %1</value>
</entry>
<entry>
<key>file '%0' cannot be read</key>
</entry>
<entry>
<key>Importer</key>
</entry>
<entry>
<key>yyyy-MM-dd HH:mm:ss</key>
</entry>
<entry>
<key>file '%0' does not exist or you have got no permission on this file</key>
</entry>
<entry>
<key>Zip</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
import("system.translate");
import("system.logging");
import("system.project");
import("system.vars");
import("system.neon");
......@@ -126,16 +128,15 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
// call webservice
var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
if (ret.hasHttpSuccessStatusCode)
if (ret.hasHttpSuccessStatusCode && ret.httpStatusCode == 200)
{
// different handling of the result per type
return pType.processResultCallback(ret.body, pValue);
}
else
{
// error handling
throw new Error(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
}
}
......@@ -151,7 +152,8 @@ WsValidationUtils.setAddressFields = function()
{
var data = JSON.parse(vars.get("$this.value"));
} catch (exception) {
// if no valid json
// if no valid json, it is a direct user input and not a uuid.
// ignore error
return
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment