Merge pull request #448 from Abyss777/save_panels_state

Save state of panels and add filter to Users dialog

3 files changed, 18 insertions, 1 deletions

diff --git a/web/app/view/Main.js b/web/app/view/Main.js
index 7989adca..da6e5394 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 2dc466f1..23113c6f 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 6b29f401..96fe96fb 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'
         }, {