From e4acd577b0f4d83780d8101c3dc5ba177d649604 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Thu, 7 Sep 2017 09:12:34 +0500
Subject: - Save attributes with correct types - Make two toolbars scrollable

---
 web/app/model/Attribute.js    |  3 +--
 web/app/view/Statistics.js    | 47 +++++++++++++++++++++++--------------------
 web/app/view/dialog/Server.js | 15 +++++---------
 web/app/view/dialog/User.js   |  3 +--
 web/app/view/edit/Users.js    |  1 +
 5 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/web/app/model/Attribute.js b/web/app/model/Attribute.js
index a4aba97e..b1586a73 100644
--- a/web/app/model/Attribute.js
+++ b/web/app/model/Attribute.js
@@ -25,8 +25,7 @@ Ext.define('Traccar.model.Attribute', {
         name: 'name',
         type: 'string'
     }, {
-        name: 'value',
-        type: 'string'
+        name: 'value'
     }, {
         name: 'attribute',
         type: 'string'
diff --git a/web/app/view/Statistics.js b/web/app/view/Statistics.js
index d5176a37..55e4d507 100644
--- a/web/app/view/Statistics.js
+++ b/web/app/view/Statistics.js
@@ -25,28 +25,31 @@ Ext.define('Traccar.view.Statistics', {
     controller: 'statistics',
     store: 'Statistics',
 
-    tbar: [{
-        xtype: 'tbtext',
-        html: Strings.reportFrom
-    }, {
-        xtype: 'datefield',
-        reference: 'fromDateField',
-        startDay: Traccar.Style.weekStartDay,
-        format: Traccar.Style.dateFormat,
-        value: new Date(new Date().getTime() - 24 * 60 * 60 * 1000)
-    }, '-', {
-        xtype: 'tbtext',
-        html: Strings.reportTo
-    }, {
-        xtype: 'datefield',
-        reference: 'toDateField',
-        startDay: Traccar.Style.weekStartDay,
-        format: Traccar.Style.dateFormat,
-        value: new Date()
-    }, '-', {
-        text: Strings.reportShow,
-        handler: 'onShowClick'
-    }],
+    tbar: {
+        scrollable: true,
+        items: [{
+            xtype: 'tbtext',
+            html: Strings.reportFrom
+        }, {
+            xtype: 'datefield',
+            reference: 'fromDateField',
+            startDay: Traccar.Style.weekStartDay,
+            format: Traccar.Style.dateFormat,
+            value: new Date(new Date().getTime() - 24 * 60 * 60 * 1000)
+        }, '-', {
+            xtype: 'tbtext',
+            html: Strings.reportTo
+        }, {
+            xtype: 'datefield',
+            reference: 'toDateField',
+            startDay: Traccar.Style.weekStartDay,
+            format: Traccar.Style.dateFormat,
+            value: new Date()
+        }, '-', {
+            text: Strings.reportShow,
+            handler: 'onShowClick'
+        }]
+    },
 
     columns: {
         defaults: {
diff --git a/web/app/view/dialog/Server.js b/web/app/view/dialog/Server.js
index c7b94576..b6343f3c 100644
--- a/web/app/view/dialog/Server.js
+++ b/web/app/view/dialog/Server.js
@@ -68,15 +68,13 @@ Ext.define('Traccar.view.dialog.Server', {
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'twelveHourFormat',
-                fieldLabel: Strings.settingsTwelveHourFormat,
-                allowBlank: false
+                fieldLabel: Strings.settingsTwelveHourFormat
             }, {
                 xtype: 'checkboxfield',
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'forceSettings',
-                fieldLabel: Strings.serverForceSettings,
-                allowBlank: false
+                fieldLabel: Strings.serverForceSettings
             }, {
                 xtype: 'combobox',
                 name: 'coordinateFormat',
@@ -96,22 +94,19 @@ Ext.define('Traccar.view.dialog.Server', {
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'registration',
-                fieldLabel: Strings.serverRegistration,
-                allowBlank: false
+                fieldLabel: Strings.serverRegistration
             }, {
                 xtype: 'checkboxfield',
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'readonly',
-                fieldLabel: Strings.serverReadonly,
-                allowBlank: false
+                fieldLabel: Strings.serverReadonly
             }, {
                 xtype: 'checkboxfield',
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'deviceReadonly',
-                fieldLabel: Strings.userDeviceReadonly,
-                allowBlank: false
+                fieldLabel: Strings.userDeviceReadonly
             }]
         }]
     },
diff --git a/web/app/view/dialog/User.js b/web/app/view/dialog/User.js
index f646d493..43990a54 100644
--- a/web/app/view/dialog/User.js
+++ b/web/app/view/dialog/User.js
@@ -85,8 +85,7 @@ Ext.define('Traccar.view.dialog.User', {
                 inputValue: true,
                 uncheckedValue: false,
                 name: 'twelveHourFormat',
-                fieldLabel: Strings.settingsTwelveHourFormat,
-                allowBlank: false
+                fieldLabel: Strings.settingsTwelveHourFormat
             }, {
                 xtype: 'combobox',
                 name: 'coordinateFormat',
diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js
index 5c1c8efe..bb121be2 100644
--- a/web/app/view/edit/Users.js
+++ b/web/app/view/edit/Users.js
@@ -33,6 +33,7 @@ Ext.define('Traccar.view.edit.Users', {
 
     tbar: {
         xtype: 'editToolbar',
+        scrollable: true,
         items: [{
             disabled: true,
             handler: 'onGeofencesClick',
-- 
cgit v1.2.3