From 7e1ed7fee9ec411df0d198d10dc1a7f8e0e6eaf9 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 27 Apr 2018 17:06:57 +1200 Subject: Rename admin to administrator --- web/app/view/edit/DevicesController.js | 8 ++++---- web/app/view/edit/Users.js | 4 ++-- web/app/view/edit/UsersController.js | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'web/app/view/edit') diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js index a0bf9dc..2b4ff14 100644 --- a/web/app/view/edit/DevicesController.js +++ b/web/app/view/edit/DevicesController.js @@ -59,8 +59,8 @@ Ext.define('Traccar.view.edit.DevicesController', { init: function () { var self = this, readonly, deviceReadonly; - deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('admin'); - readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('admin'); + deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('administrator'); + readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('administrator'); this.lookupReference('toolbarAddButton').setDisabled(readonly || deviceReadonly); this.lookupReference('toolbarDeviceMenu').setHidden(readonly || deviceReadonly); @@ -98,8 +98,8 @@ Ext.define('Traccar.view.edit.DevicesController', { updateButtons: function (selected) { var readonly, deviceReadonly, empty, deviceMenu; - deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('admin'); - readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('admin'); + deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('administrator'); + readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('administrator'); empty = selected.length === 0; this.lookupReference('toolbarEditButton').setDisabled(empty || readonly || deviceReadonly); this.lookupReference('toolbarRemoveButton').setDisabled(empty || readonly || deviceReadonly); diff --git a/web/app/view/edit/Users.js b/web/app/view/edit/Users.js index 3629e82..e2dd9aa 100644 --- a/web/app/view/edit/Users.js +++ b/web/app/view/edit/Users.js @@ -125,8 +125,8 @@ Ext.define('Traccar.view.edit.Users', { filter: 'string' }, { text: Strings.userAdmin, - dataIndex: 'admin', - renderer: Traccar.AttributeFormatter.getFormatter('admin'), + dataIndex: 'administrator', + renderer: Traccar.AttributeFormatter.getFormatter('administrator'), filter: 'boolean' }, { text: Strings.serverReadonly, diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js index f3154b1..9d99816 100644 --- a/web/app/view/edit/UsersController.js +++ b/web/app/view/edit/UsersController.js @@ -42,7 +42,7 @@ Ext.define('Traccar.view.edit.UsersController', { init: function () { Ext.getStore('Users').load(); - this.lookupReference('userUsersButton').setHidden(!Traccar.app.getUser().get('admin')); + this.lookupReference('userUsersButton').setHidden(!Traccar.app.getUser().get('administrator')); this.lookupReference('userDriversButton').setHidden( Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers')); this.lookupReference('userAttributesButton').setHidden( @@ -66,7 +66,7 @@ Ext.define('Traccar.view.edit.UsersController', { onAddClick: function () { var user, dialog; user = Ext.create('Traccar.model.User'); - if (Traccar.app.getUser().get('admin')) { + if (Traccar.app.getUser().get('administrator')) { user.set('deviceLimit', -1); } if (Traccar.app.getUser().get('expirationTime')) { -- cgit v1.2.3