diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-09-01 18:00:40 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-01 18:00:40 +1200 |
commit | 1fe4c2e0b636646fddb28081c7cdfd3c5593ae77 (patch) | |
tree | d8b06aab9ec9824947d927a68a2d49d918d90285 | |
parent | ee8beb01019f381eae09fb94e249e3d5b9312bbb (diff) | |
parent | 96cc4ea75f9ceb19a38118c5d15504a66456463e (diff) | |
download | trackermap-server-1fe4c2e0b636646fddb28081c7cdfd3c5593ae77.tar.gz trackermap-server-1fe4c2e0b636646fddb28081c7cdfd3c5593ae77.tar.bz2 trackermap-server-1fe4c2e0b636646fddb28081c7cdfd3c5593ae77.zip |
Merge pull request #2276 from Abyss777/fix_phone
Rename phoneNumber constant and field in web
-rw-r--r-- | web/app/view/CommandDialog.js | 4 | ||||
-rw-r--r-- | web/app/view/CommandDialogController.js | 10 | ||||
-rw-r--r-- | web/l10n/en.json | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/web/app/view/CommandDialog.js b/web/app/view/CommandDialog.js index d9c3beeb3..a374ab0ef 100644 --- a/web/app/view/CommandDialog.js +++ b/web/app/view/CommandDialog.js @@ -78,8 +78,8 @@ Ext.define('Traccar.view.CommandDialog', { items: [{ xtype: 'textfield', - fieldLabel: Strings.commandPhoneNumber, - name: 'phoneNumber' + fieldLabel: Strings.commandPhone, + name: 'phone' }, { xtype: 'textfield', reference: 'paramSmsMessage', diff --git a/web/app/view/CommandDialogController.js b/web/app/view/CommandDialogController.js index 120854df1..402006579 100644 --- a/web/app/view/CommandDialogController.js +++ b/web/app/view/CommandDialogController.js @@ -32,7 +32,7 @@ Ext.define('Traccar.view.CommandDialogController', { }, onSendClick: function (button) { - var attributes, value, record, form, index, phoneNumber; + var attributes, value, record, form, index, phone; form = button.up('window').down('form'); form.updateRecord(); @@ -61,18 +61,18 @@ Ext.define('Traccar.view.CommandDialogController', { if (record.get('type') === 'sendUssd') { attributes = this.lookupReference('paramSendSmsUssd'); - phoneNumber = attributes.down('textfield[name="phoneNumber"]').getValue(); + phone = attributes.down('textfield[name="phone"]').getValue(); record.set('attributes', { - phoneNumber: phoneNumber + phone: phone }); } if (record.get('type') === 'sendSms') { attributes = this.lookupReference('paramSendSmsUssd'); - phoneNumber = attributes.down('textfield[name="phoneNumber"]').getValue(); + phone = attributes.down('textfield[name="phone"]').getValue(); value = attributes.down('textfield[name="message"]').getValue(); record.set('attributes', { - phoneNumber: phoneNumber, + phone: phone, message: value }); } diff --git a/web/l10n/en.json b/web/l10n/en.json index c4a130cf0..563a37b18 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -118,7 +118,7 @@ "commandDeviceIdentification": "Device Identification", "commandIndex": "Index", "commandData": "Data", - "commandPhoneNumber": "Phone Number", + "commandPhone": "Phone Number", "commandMessage": "Message", "eventAll": "All Events", "eventDeviceOnline": "Device is online", |