diff options
| author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-15 00:04:31 +1300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 00:04:31 +1300 |
| commit | d77cc1c9b2890224119d59b493597e47e3f1792f (patch) | |
| tree | ae66a605bfdcc307c2ee3d179665f07ba8346032 /web/app/view | |
| parent | 0b5e524dc21b0a29234ba9e7c60393c0ab95dfb2 (diff) | |
| parent | 375de0803d0e7b6289047f70863137007f90a2e8 (diff) | |
| download | trackermap-web-d77cc1c9b2890224119d59b493597e47e3f1792f.tar.gz trackermap-web-d77cc1c9b2890224119d59b493597e47e3f1792f.tar.bz2 trackermap-web-d77cc1c9b2890224119d59b493597e47e3f1792f.zip | |
Merge pull request #438 from Abyss777/timezone
Implement Timezone field
Diffstat (limited to 'web/app/view')
| -rw-r--r-- | web/app/view/ServerDialog.js | 8 | ||||
| -rw-r--r-- | web/app/view/UserDialog.js | 8 |
2 files changed, 16 insertions, 0 deletions
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js index e5021b5f..bba5e729 100644 --- a/web/app/view/ServerDialog.js +++ b/web/app/view/ServerDialog.js @@ -101,6 +101,14 @@ Ext.define('Traccar.view.ServerDialog', { displayField: 'name', valueField: 'key', editable: false + }, { + xtype: 'combobox', + name: 'timezone', + fieldLabel: Strings.sharedTimezone, + store: 'AllTimezones', + queryMode: 'local', + displayField: 'key', + editable: false }] }, { xtype: 'fieldset', diff --git a/web/app/view/UserDialog.js b/web/app/view/UserDialog.js index d4235e9e..874f9f00 100644 --- a/web/app/view/UserDialog.js +++ b/web/app/view/UserDialog.js @@ -111,6 +111,14 @@ Ext.define('Traccar.view.UserDialog', { displayField: 'name', valueField: 'key', editable: false + }, { + xtype: 'combobox', + name: 'timezone', + fieldLabel: Strings.sharedTimezone, + store: 'AllTimezones', + queryMode: 'local', + displayField: 'key', + editable: false }] }, { xtype: 'fieldset', |