Skip to content

Commit

Permalink
Remove field in legacy
Browse files Browse the repository at this point in the history
  • Loading branch information
tananaev committed Feb 7, 2025
1 parent 7f07ebc commit 93bb127
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 28 deletions.
6 changes: 1 addition & 5 deletions legacy/web/app/AttributeFormatter.js
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,7 @@ Ext.define('Traccar.AttributeFormatter', {
} else if (typeof value === 'boolean') {
return value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no;
} else if (value instanceof Date) {
if (Traccar.app.getPreference('twelveHourFormat', false)) {
return Ext.Date.format(value, Traccar.Style.dateTimeFormat12);
} else {
return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
}
return Ext.Date.format(value, Traccar.Style.dateTimeFormat24);
}
return value;
},
Expand Down
3 changes: 0 additions & 3 deletions legacy/web/app/model/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ Ext.define('Traccar.model.Server', {
}, {
name: 'zoom',
type: 'int'
}, {
name: 'twelveHourFormat',
type: 'boolean'
}, {
name: 'forceSettings',
type: 'boolean'
Expand Down
3 changes: 0 additions & 3 deletions legacy/web/app/model/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,6 @@ Ext.define('Traccar.model.User', {
}, {
name: 'zoom',
type: 'int'
}, {
name: 'twelveHourFormat',
type: 'boolean'
}, {
name: 'coordinateFormat',
type: 'string'
Expand Down
6 changes: 1 addition & 5 deletions legacy/web/app/view/CustomTimeField.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ Ext.define('Traccar.view.CustomTimeField', {
xtype: 'customTimeField',

constructor: function (config) {
if (Traccar.app.getPreference('twelveHourFormat', false)) {
config.format = Traccar.Style.timeFormat12;
} else {
config.format = Traccar.Style.timeFormat24;
}
config.format = Traccar.Style.timeFormat24;
this.callParent(arguments);
}
});
6 changes: 0 additions & 6 deletions legacy/web/app/view/dialog/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ Ext.define('Traccar.view.dialog.Server', {
reference: 'zoom',
name: 'zoom',
fieldLabel: Strings.serverZoom
}, {
xtype: 'checkboxfield',
inputValue: true,
uncheckedValue: false,
name: 'twelveHourFormat',
fieldLabel: Strings.settingsTwelveHourFormat
}, {
xtype: 'checkboxfield',
inputValue: true,
Expand Down
6 changes: 0 additions & 6 deletions legacy/web/app/view/dialog/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,6 @@ Ext.define('Traccar.view.dialog.User', {
reference: 'zoom',
name: 'zoom',
fieldLabel: Strings.serverZoom
}, {
xtype: 'checkboxfield',
inputValue: true,
uncheckedValue: false,
name: 'twelveHourFormat',
fieldLabel: Strings.settingsTwelveHourFormat
}, {
xtype: 'clearableComboBox',
name: 'coordinateFormat',
Expand Down

0 comments on commit 93bb127

Please sign in to comment.