From 27f3933f86a1645f700fbdafa96e0b03e7c82670 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 25 Mar 2017 10:08:52 +0500 Subject: - Save state of State panel - Add filter for Users email --- web/app/view/Main.js | 2 ++ web/app/view/State.js | 3 +++ web/app/view/Users.js | 14 +++++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) (limited to 'web/app/view') 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,10 +92,19 @@ 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' -- cgit v1.2.3