aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/dialog
diff options
context:
space:
mode:
Diffstat (limited to 'web/app/view/dialog')
-rw-r--r--web/app/view/dialog/Device.js29
-rw-r--r--web/app/view/dialog/Geofence.js4
-rw-r--r--web/app/view/dialog/Group.js30
-rw-r--r--web/app/view/dialog/Server.js11
-rw-r--r--web/app/view/dialog/User.js11
5 files changed, 32 insertions, 53 deletions
diff --git a/web/app/view/dialog/Device.js b/web/app/view/dialog/Device.js
index 80b16390..c024bf3c 100644
--- a/web/app/view/dialog/Device.js
+++ b/web/app/view/dialog/Device.js
@@ -18,6 +18,10 @@
Ext.define('Traccar.view.dialog.Device', {
extend: 'Traccar.view.dialog.BaseEdit',
+ requires: [
+ 'Traccar.view.ClearableComboBox'
+ ],
+
title: Strings.sharedDevice,
items: {
@@ -42,26 +46,13 @@ Ext.define('Traccar.view.dialog.Device', {
collapsible: true,
collapsed: true,
items: [{
- xtype: 'fieldcontainer',
- layout: 'hbox',
+ xtype: 'clearableComboBox',
+ name: 'groupId',
fieldLabel: Strings.groupParent,
- items: [{
- xtype: 'combobox',
- name: 'groupId',
- store: 'Groups',
- queryMode: 'local',
- displayField: 'name',
- valueField: 'id',
- width: Traccar.Style.formFieldWithButtonWidth,
- editable: false
- }, {
- xtype: 'button',
- glyph: 'xf00d@FontAwesome',
- margin: '0 0 0 3px',
- handler: function (button) {
- button.up().down().clearValue();
- }
- }]
+ store: 'Groups',
+ queryMode: 'local',
+ displayField: 'name',
+ valueField: 'id'
}, {
xtype: 'textfield',
name: 'phone',
diff --git a/web/app/view/dialog/Geofence.js b/web/app/view/dialog/Geofence.js
index 9d7a59a1..65c32c04 100644
--- a/web/app/view/dialog/Geofence.js
+++ b/web/app/view/dialog/Geofence.js
@@ -19,6 +19,7 @@ Ext.define('Traccar.view.dialog.Geofence', {
extend: 'Traccar.view.dialog.BaseEdit',
requires: [
+ 'Traccar.view.ClearableComboBox',
'Traccar.view.dialog.GeofenceController'
],
@@ -45,14 +46,13 @@ Ext.define('Traccar.view.dialog.Geofence', {
name: 'description',
fieldLabel: Strings.sharedDescription
}, {
- xtype: 'combobox',
+ xtype: 'clearableComboBox',
reference: 'calendarCombo',
name: 'calendarId',
store: 'Calendars',
queryMode: 'local',
displayField: 'name',
valueField: 'id',
- editable: false,
fieldLabel: Strings.sharedCalendar
}, {
xtype: 'hiddenfield',
diff --git a/web/app/view/dialog/Group.js b/web/app/view/dialog/Group.js
index 3a94202d..8ce6282d 100644
--- a/web/app/view/dialog/Group.js
+++ b/web/app/view/dialog/Group.js
@@ -18,6 +18,10 @@
Ext.define('Traccar.view.dialog.Group', {
extend: 'Traccar.view.dialog.BaseEdit',
+ requires: [
+ 'Traccar.view.ClearableComboBox'
+ ],
+
title: Strings.groupDialog,
items: {
@@ -37,26 +41,12 @@ Ext.define('Traccar.view.dialog.Group', {
collapsible: true,
collapsed: true,
items: [{
- xtype: 'fieldcontainer',
- layout: 'hbox',
- fieldLabel: Strings.groupParent,
- items: [{
- xtype: 'combobox',
- name: 'groupId',
- store: 'Groups',
- queryMode: 'local',
- displayField: 'name',
- valueField: 'id',
- width: Traccar.Style.formFieldWithButtonWidth,
- editable: false
- }, {
- xtype: 'button',
- glyph: 'xf00d@FontAwesome',
- margin: '0 0 0 3px',
- handler: function (button) {
- button.up().down().clearValue();
- }
- }]
+ xtype: 'clearableComboBox',
+ name: 'groupId',
+ store: 'Groups',
+ queryMode: 'local',
+ displayField: 'name',
+ valueField: 'id'
}]
}]
}
diff --git a/web/app/view/dialog/Server.js b/web/app/view/dialog/Server.js
index 1fe2184c..a39408d5 100644
--- a/web/app/view/dialog/Server.js
+++ b/web/app/view/dialog/Server.js
@@ -19,6 +19,7 @@ Ext.define('Traccar.view.dialog.Server', {
extend: 'Traccar.view.dialog.BaseEdit',
requires: [
+ 'Traccar.view.ClearableComboBox',
'Traccar.view.dialog.MapPickerController'
],
@@ -31,13 +32,12 @@ Ext.define('Traccar.view.dialog.Server', {
xtype: 'fieldset',
title: Strings.sharedPreferences,
items: [{
- xtype: 'combobox',
+ xtype: 'clearableComboBox',
name: 'map',
fieldLabel: Strings.mapLayer,
store: 'MapTypes',
displayField: 'name',
- valueField: 'key',
- editable: false
+ valueField: 'key'
}, {
xtype: 'textfield',
name: 'bingKey',
@@ -76,13 +76,12 @@ Ext.define('Traccar.view.dialog.Server', {
name: 'forceSettings',
fieldLabel: Strings.serverForceSettings
}, {
- xtype: 'combobox',
+ xtype: 'clearableComboBox',
name: 'coordinateFormat',
fieldLabel: Strings.settingsCoordinateFormat,
store: 'CoordinateFormats',
displayField: 'name',
- valueField: 'key',
- editable: false
+ valueField: 'key'
}]
}, {
xtype: 'fieldset',
diff --git a/web/app/view/dialog/User.js b/web/app/view/dialog/User.js
index 36bccfeb..be27a51a 100644
--- a/web/app/view/dialog/User.js
+++ b/web/app/view/dialog/User.js
@@ -19,6 +19,7 @@ Ext.define('Traccar.view.dialog.User', {
extend: 'Traccar.view.dialog.BaseEdit',
requires: [
+ 'Traccar.view.ClearableComboBox',
'Traccar.view.dialog.UserController'
],
@@ -56,13 +57,12 @@ Ext.define('Traccar.view.dialog.User', {
name: 'phone',
fieldLabel: Strings.sharedPhone
}, {
- xtype: 'combobox',
+ xtype: 'clearableComboBox',
name: 'map',
fieldLabel: Strings.mapLayer,
store: 'MapTypes',
displayField: 'name',
- valueField: 'key',
- editable: false
+ valueField: 'key'
}, {
xtype: 'numberfield',
reference: 'latitude',
@@ -87,13 +87,12 @@ Ext.define('Traccar.view.dialog.User', {
name: 'twelveHourFormat',
fieldLabel: Strings.settingsTwelveHourFormat
}, {
- xtype: 'combobox',
+ xtype: 'clearableComboBox',
name: 'coordinateFormat',
fieldLabel: Strings.settingsCoordinateFormat,
store: 'CoordinateFormats',
displayField: 'name',
- valueField: 'key',
- editable: false
+ valueField: 'key'
}]
}, {
xtype: 'fieldset',