From 3548f0db6f0adc055b2b279708d7a59bcc1c66b4 Mon Sep 17 00:00:00 2001 From: Thomas Kooi Date: Tue, 14 Nov 2017 08:54:35 +0100 Subject: [PATCH] refactor(webapp): simplify isAdmin statement (#1388) --- app/components/createConfig/createConfigController.js | 2 +- app/components/createContainer/createContainerController.js | 4 ++-- app/components/createNetwork/createNetworkController.js | 2 +- app/components/createSecret/createSecretController.js | 2 +- app/components/createService/createServiceController.js | 4 ++-- app/components/createStack/createStackController.js | 2 +- app/components/createVolume/createVolumeController.js | 2 +- app/components/templates/templatesController.js | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/components/createConfig/createConfigController.js b/app/components/createConfig/createConfigController.js index 6d390f97f..071b38bdd 100644 --- a/app/components/createConfig/createConfigController.js +++ b/app/components/createConfig/createConfigController.js @@ -60,7 +60,7 @@ function ($scope, $state, $document, Notifications, ConfigService, Authenticatio $scope.create = function () { var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; diff --git a/app/components/createContainer/createContainerController.js b/app/components/createContainer/createContainerController.js index 65c9fe817..c62817aac 100644 --- a/app/components/createContainer/createContainerController.js +++ b/app/components/createContainer/createContainerController.js @@ -550,7 +550,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai }); var userDetails = Authentication.getUserDetails(); - $scope.isAdmin = userDetails.role === 1 ? true : false; + $scope.isAdmin = userDetails.role === 1; } function validateForm(accessControlData, isAdmin) { @@ -574,7 +574,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; diff --git a/app/components/createNetwork/createNetworkController.js b/app/components/createNetwork/createNetworkController.js index a973e4632..eedb272ca 100644 --- a/app/components/createNetwork/createNetworkController.js +++ b/app/components/createNetwork/createNetworkController.js @@ -93,7 +93,7 @@ function ($q, $scope, $state, PluginService, Notifications, NetworkService, Labe var networkConfiguration = prepareConfiguration(); var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; diff --git a/app/components/createSecret/createSecretController.js b/app/components/createSecret/createSecretController.js index de81a7bc3..18c9d3903 100644 --- a/app/components/createSecret/createSecretController.js +++ b/app/components/createSecret/createSecretController.js @@ -59,7 +59,7 @@ function ($scope, $state, Notifications, SecretService, LabelHelper, Authenticat var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; diff --git a/app/components/createService/createServiceController.js b/app/components/createService/createServiceController.js index 24f8a7e0e..7f7ef4498 100644 --- a/app/components/createService/createServiceController.js +++ b/app/components/createService/createServiceController.js @@ -387,7 +387,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; @@ -443,7 +443,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C var settings = data.settings; $scope.allowBindMounts = settings.AllowBindMountsForRegularUsers; var userDetails = Authentication.getUserDetails(); - $scope.isAdmin = userDetails.role === 1 ? true : false; + $scope.isAdmin = userDetails.role === 1; }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to initialize view'); diff --git a/app/components/createStack/createStackController.js b/app/components/createStack/createStackController.js index 04f487490..ba2ccf5ba 100644 --- a/app/components/createStack/createStackController.js +++ b/app/components/createStack/createStackController.js @@ -67,7 +67,7 @@ function ($scope, $state, $document, StackService, CodeMirrorService, Authentica var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; var userId = userDetails.ID; if (!validateForm(accessControlData, isAdmin)) { diff --git a/app/components/createVolume/createVolumeController.js b/app/components/createVolume/createVolumeController.js index bffdf874e..491276484 100644 --- a/app/components/createVolume/createVolumeController.js +++ b/app/components/createVolume/createVolumeController.js @@ -43,7 +43,7 @@ function ($q, $scope, $state, VolumeService, PluginService, ResourceControlServi var volumeConfiguration = VolumeService.createVolumeConfiguration(name, driver, driverOptions); var accessControlData = $scope.formValues.AccessControlData; var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js index c6610886e..0b03d76c5 100644 --- a/app/components/templates/templatesController.js +++ b/app/components/templates/templatesController.js @@ -122,7 +122,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer var userDetails = Authentication.getUserDetails(); var userId = userDetails.ID; var accessControlData = $scope.formValues.AccessControlData; - var isAdmin = userDetails.role === 1 ? true : false; + var isAdmin = userDetails.role === 1; if (!validateForm(accessControlData, isAdmin)) { return; @@ -241,7 +241,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer $scope.templatesKey = templatesKey; var userDetails = Authentication.getUserDetails(); - $scope.isAdmin = userDetails.role === 1 ? true : false; + $scope.isAdmin = userDetails.role === 1; var endpointMode = $scope.applicationState.endpoint.mode; var apiVersion = $scope.applicationState.endpoint.apiVersion;