aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-05-23 15:23:07 +0500
committerAbyss777 <abyss@fox5.ru>2017-05-23 15:23:07 +0500
commit7f1a29d1f6606cd7d6469f769fd0e303badcd591 (patch)
tree93cc074eae61fe2b20ac2fa247ca61e2744daeaa
parentd243caa095ece5c130250d02e4f3ae7632a9db36 (diff)
downloadtrackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.tar.gz
trackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.tar.bz2
trackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.zip
- Revert showError function
- Fix strings
-rw-r--r--web/app/Application.js17
-rw-r--r--web/app/view/dialog/SelectDevice.js2
-rw-r--r--web/app/view/dialog/SelectDeviceController.js12
-rw-r--r--web/l10n/en.json5
4 files changed, 18 insertions, 18 deletions
diff --git a/web/app/Application.js b/web/app/Application.js
index 0125cd0f..d73378c5 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -164,24 +164,15 @@ Ext.define('Traccar.Application', {
}
},
- showError: function (error, success) {
- var title, general;
- if (success) {
- title = Strings.infoTitle;
- general = Strings.infoGeneral;
- } else {
- title = Strings.errorTitle;
- general = Strings.errorGeneral;
- }
-
+ showError: function (error) {
if (Ext.isString(error)) {
- Ext.Msg.alert(title, error);
+ Ext.Msg.alert(Strings.errorTitle, error);
} else if (error.responseText) {
- Ext.Msg.alert(title, general +
+ Ext.Msg.alert(Strings.errorTitle, Strings.errorGeneral +
'<br><br><textarea readonly rows="5" style="resize: none; width: 100%;">' +
error.responseText + '</textarea>');
} else if (error.statusText) {
- Ext.Msg.alert(title, error.statusText);
+ Ext.Msg.alert(Strings.errorTitle, error.statusText);
} else {
Ext.Msg.alert(Strings.errorTitle, Strings.errorConnection);
}
diff --git a/web/app/view/dialog/SelectDevice.js b/web/app/view/dialog/SelectDevice.js
index 8037453e..5b11c03f 100644
--- a/web/app/view/dialog/SelectDevice.js
+++ b/web/app/view/dialog/SelectDevice.js
@@ -23,7 +23,7 @@ Ext.define('Traccar.view.dialog.SelectDevice', {
],
controller: 'selectDevice',
- title: Strings.sharedSelectDevice,
+ title: Strings.sharedDevice,
items: {
xtype: 'form',
diff --git a/web/app/view/dialog/SelectDeviceController.js b/web/app/view/dialog/SelectDeviceController.js
index 4336c48b..d8cd5d3a 100644
--- a/web/app/view/dialog/SelectDeviceController.js
+++ b/web/app/view/dialog/SelectDeviceController.js
@@ -29,7 +29,17 @@ Ext.define('Traccar.view.dialog.SelectDeviceController', {
method: 'POST',
jsonData: Ext.util.JSON.encode(record),
callback: function (options, success, response) {
- Traccar.app.showError(response, success);
+ if (success) {
+ if (response.responseText) {
+ Ext.Msg.alert(Strings.sharedInfoTitle, Strings.sharedInfoGeneral +
+ '<br><br><textarea readonly rows="5" style="resize: none; width: 100%;">' +
+ response.responseText + '</textarea>');
+ } else if (response.statusText) {
+ Ext.Msg.alert(Strings.sharedInfoTitle, response.statusText);
+ }
+ } else {
+ Traccar.app.showError(response);
+ }
}
});
button.up('window').close();
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 6e78e5c7..024f1478 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -50,7 +50,6 @@
"sharedExpression": "Expression",
"sharedDeviceDistance": "Device Distance",
"sharedDevice": "Device",
- "sharedSelectDevice": "Select Device",
"sharedTestNotification": "Send Test Notification",
"sharedCalendar": "Calendar",
"sharedCalendars": "Calendars",
@@ -65,6 +64,8 @@
"sharedTypeNumber": "Number",
"sharedTypeBoolean": "Boolean",
"sharedTimezone": "Timezone",
+ "sharedInfoTitle": "Info",
+ "sharedInfoGeneral": "Responce",
"attributeSpeedLimit": "Speed Limit",
"attributeReportIgnoreOdometer": "Report: Ignore Odometer",
"attributeMaintenanceStart": "Maintenance: Start",
@@ -89,8 +90,6 @@
"errorGeneral": "Invalid parameters or constraints violation",
"errorConnection": "Connection error",
"errorSocket": "Web socket connection error",
- "infoTitle": "Info",
- "infoGeneral": "Responce",
"userEmail": "Email",
"userPassword": "Password",
"userAdmin": "Admin",