diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-03-25 18:26:56 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-25 18:26:56 +1300 |
commit | c4e1f652ca5ad459c2d29e1e3c92dc251c5adcb8 (patch) | |
tree | 4e8bfdc028cd27fe1fb4a81e6fc04f6950fe181b /web/app/view | |
parent | d68f47ef27eb6afc28444f2e7e0a8310ae4f25b5 (diff) | |
parent | 27f3933f86a1645f700fbdafa96e0b03e7c82670 (diff) | |
download | etbsa-traccar-web-c4e1f652ca5ad459c2d29e1e3c92dc251c5adcb8.tar.gz etbsa-traccar-web-c4e1f652ca5ad459c2d29e1e3c92dc251c5adcb8.tar.bz2 etbsa-traccar-web-c4e1f652ca5ad459c2d29e1e3c92dc251c5adcb8.zip |
Merge pull request #448 from Abyss777/save_panels_state
Save state of panels and add filter to Users dialog
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/Main.js | 2 | ||||
-rw-r--r-- | web/app/view/State.js | 3 | ||||
-rw-r--r-- | web/app/view/Users.js | 14 |
3 files changed, 18 insertions, 1 deletions
diff --git a/web/app/view/Main.js b/web/app/view/Main.js index 7989adc..da6e539 100644 --- a/web/app/view/Main.js +++ b/web/app/view/Main.js @@ -41,6 +41,8 @@ Ext.define('Traccar.view.Main', { title: Strings.devicesAndState, titleCollapse: true, floatable: false, + stateful: true, + stateId: 'devices-and-state-panel', defaults: { split: true, diff --git a/web/app/view/State.js b/web/app/view/State.js index 2dc466f..23113c6 100644 --- a/web/app/view/State.js +++ b/web/app/view/State.js @@ -26,6 +26,9 @@ Ext.define('Traccar.view.State', { controller: 'state', store: 'Attributes', + stateful: true, + stateId: 'state-grid', + tbar: { componentCls: 'toolbar-header-style', items: [{ diff --git a/web/app/view/Users.js b/web/app/view/Users.js index 6b29f40..96fe96f 100644 --- a/web/app/view/Users.js +++ b/web/app/view/Users.js @@ -21,6 +21,7 @@ Ext.define('Traccar.view.Users', { xtype: 'usersView', requires: [ + 'Ext.grid.filters.Filters', 'Traccar.view.UsersController', 'Traccar.view.EditToolbar' ], @@ -28,6 +29,8 @@ Ext.define('Traccar.view.Users', { controller: 'users', store: 'Users', + plugins: 'gridfilters', + tbar: { xtype: 'editToolbar', items: [{ @@ -89,11 +92,20 @@ Ext.define('Traccar.view.Users', { dataIndex: 'name' }, { text: Strings.userEmail, - dataIndex: 'email' + dataIndex: 'email', + filter: 'string' }, { text: Strings.userAdmin, dataIndex: 'admin' }, { + text: Strings.serverReadonly, + dataIndex: 'readonly', + hidden: true + }, { + text: Strings.userDeviceReadonly, + dataIndex: 'deviceReadonly', + hidden: true + }, { text: Strings.userDisabled, dataIndex: 'disabled' }, { |