diff options
author | Abyss777 <abyss@fox5.ru> | 2017-05-23 15:23:07 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-05-23 15:23:07 +0500 |
commit | 7f1a29d1f6606cd7d6469f769fd0e303badcd591 (patch) | |
tree | 93cc074eae61fe2b20ac2fa247ca61e2744daeaa /web/app/view/dialog | |
parent | d243caa095ece5c130250d02e4f3ae7632a9db36 (diff) | |
download | trackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.tar.gz trackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.tar.bz2 trackermap-web-7f1a29d1f6606cd7d6469f769fd0e303badcd591.zip |
- Revert showError function
- Fix strings
Diffstat (limited to 'web/app/view/dialog')
-rw-r--r-- | web/app/view/dialog/SelectDevice.js | 2 | ||||
-rw-r--r-- | web/app/view/dialog/SelectDeviceController.js | 12 |
2 files changed, 12 insertions, 2 deletions
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(); |