1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-07 23:05:26 +02:00

fix(team): disable team leader setting when external auth sync is enabled [EE-3579] (#7852)

This commit is contained in:
Oscar Zhou 2022-10-25 14:39:24 +13:00 committed by GitHub
parent 55211ef00e
commit cb9fe2606c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 36 additions and 0 deletions

View file

@ -147,6 +147,7 @@ export const componentsModule = angular
'name',
'placeholder',
'teams',
'disabled',
])
)
.component(

View file

@ -118,9 +118,20 @@
data-cy="'user-teamSelect'"
on-change="(onChangeTeamIds)"
input-id="'teams-selector'"
disabled="teamSync"
></teams-selector>
</div>
</div>
<div class="form-group" ng-if="teamSync">
<div class="col-sm-12">
<span class="small">
<p class="small text-muted vertical-center">
<pr-icon icon="'alert-circle'" feather="true" class-name="'icon-warning =vertical-center'"></pr-icon>
The team leader feature is disabled as external authentication is currently enabled with team sync.
</p>
</span>
</div>
</div>
<!-- !teams -->
<div class="form-group" ng-if="isAdmin && !formValues.Administrator && formValues.Teams.length === 0">
<div class="col-sm-12">

View file

@ -131,6 +131,7 @@ angular.module('portainer.app').controller('UsersController', [
$scope.teams = _.orderBy(data.teams, 'Name', 'asc');
$scope.AuthenticationMethod = data.settings.AuthenticationMethod;
$scope.requiredPasswordLength = data.settings.RequiredPasswordLength;
$scope.teamSync = data.settings.TeamSync;
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve users and teams');