mirror of https://github.com/portainer/portainer
refactor(webapp): simplify isAdmin statement (#1388)
parent
521cc3d6ab
commit
3548f0db6f
|
@ -60,7 +60,7 @@ function ($scope, $state, $document, Notifications, ConfigService, Authenticatio
|
||||||
$scope.create = function () {
|
$scope.create = function () {
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -550,7 +550,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
|
||||||
});
|
});
|
||||||
|
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
$scope.isAdmin = userDetails.role === 1 ? true : false;
|
$scope.isAdmin = userDetails.role === 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
function validateForm(accessControlData, isAdmin) {
|
function validateForm(accessControlData, isAdmin) {
|
||||||
|
@ -574,7 +574,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai
|
||||||
|
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -93,7 +93,7 @@ function ($q, $scope, $state, PluginService, Notifications, NetworkService, Labe
|
||||||
var networkConfiguration = prepareConfiguration();
|
var networkConfiguration = prepareConfiguration();
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -59,7 +59,7 @@ function ($scope, $state, Notifications, SecretService, LabelHelper, Authenticat
|
||||||
|
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -387,7 +387,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
|
||||||
|
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
@ -443,7 +443,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C
|
||||||
var settings = data.settings;
|
var settings = data.settings;
|
||||||
$scope.allowBindMounts = settings.AllowBindMountsForRegularUsers;
|
$scope.allowBindMounts = settings.AllowBindMountsForRegularUsers;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
$scope.isAdmin = userDetails.role === 1 ? true : false;
|
$scope.isAdmin = userDetails.role === 1;
|
||||||
})
|
})
|
||||||
.catch(function error(err) {
|
.catch(function error(err) {
|
||||||
Notifications.error('Failure', err, 'Unable to initialize view');
|
Notifications.error('Failure', err, 'Unable to initialize view');
|
||||||
|
|
|
@ -67,7 +67,7 @@ function ($scope, $state, $document, StackService, CodeMirrorService, Authentica
|
||||||
|
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
var userId = userDetails.ID;
|
var userId = userDetails.ID;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
|
|
|
@ -43,7 +43,7 @@ function ($q, $scope, $state, VolumeService, PluginService, ResourceControlServi
|
||||||
var volumeConfiguration = VolumeService.createVolumeConfiguration(name, driver, driverOptions);
|
var volumeConfiguration = VolumeService.createVolumeConfiguration(name, driver, driverOptions);
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -122,7 +122,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
var userId = userDetails.ID;
|
var userId = userDetails.ID;
|
||||||
var accessControlData = $scope.formValues.AccessControlData;
|
var accessControlData = $scope.formValues.AccessControlData;
|
||||||
var isAdmin = userDetails.role === 1 ? true : false;
|
var isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
if (!validateForm(accessControlData, isAdmin)) {
|
if (!validateForm(accessControlData, isAdmin)) {
|
||||||
return;
|
return;
|
||||||
|
@ -241,7 +241,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer
|
||||||
$scope.templatesKey = templatesKey;
|
$scope.templatesKey = templatesKey;
|
||||||
|
|
||||||
var userDetails = Authentication.getUserDetails();
|
var userDetails = Authentication.getUserDetails();
|
||||||
$scope.isAdmin = userDetails.role === 1 ? true : false;
|
$scope.isAdmin = userDetails.role === 1;
|
||||||
|
|
||||||
var endpointMode = $scope.applicationState.endpoint.mode;
|
var endpointMode = $scope.applicationState.endpoint.mode;
|
||||||
var apiVersion = $scope.applicationState.endpoint.apiVersion;
|
var apiVersion = $scope.applicationState.endpoint.apiVersion;
|
||||||
|
|
Loading…
Reference in New Issue