Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-08 07:15:23 +02:00
Code Issues Releases Activity

EE-3905 changes for item 1,2,3,4,9,10,12,13,14 (#7467)

Browse source
This commit is contained in:
Rex Wang 2022-08-12 12:47:44 +08:00 • committed by GitHub
parent 95fb5a4baa
commit b67f404d8d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 66 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/portainer/components/accessControlForm/porAccessControlForm.html
View file

@ -69,8 +69,8 @@
class="form-group mt-4"
ng-if="$ctrl.formData.AccessControlEnabled && $ctrl.formData.Ownership === $ctrl.RCO.RESTRICTED && ($ctrl.isAdmin || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1))"
>
<div class="col-sm-12">
<label for="group-access" class="control-label text-left col-sm-3 col-sm-2 !p-0">
<div class="col-sm-12 vertical-center">
<label for="group-access" class="control-label text-left col-sm-3 col-lg-2 !p-0">
Authorized teams
<portainer-tooltip
ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length > 0"
@ -84,9 +84,10 @@
<span ng-if="$ctrl.isAdmin && $ctrl.availableTeams.length === 0" class="small text-muted" style="margin-left: 20px">
You have not yet created any teams. Head over to the <a ui-sref="portainer.teams">Teams view</a> to manage teams.
</span>
<span
<div
isteven-multi-select
ng-if="($ctrl.isAdmin && $ctrl.availableTeams.length > 0) || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1)"
class="col-sm-9 col-lg-10"
input-model="$ctrl.availableTeams"
output-model="$ctrl.formData.AuthorizedTeams"
button-label="Name"
@ -95,17 +96,16 @@
helper-elements="filter"
search-property="Name"
translation="{nothingSelected: 'Select one or more teams', search: 'Search...'}"
style="margin-left: 20px"
data-cy="portainer-selectTeamAccess"
>
</span>
</div>
</div>
</div>
<!-- !authorized-teams -->
<!-- authorized-users -->
<div class="form-group" ng-if="$ctrl.formData.AccessControlEnabled && $ctrl.formData.Ownership === $ctrl.RCO.RESTRICTED && $ctrl.isAdmin">
<div class="col-sm-12">
<label for="group-access" class="control-label text-left col-sm-3 col-sm-2 !p-0">
<div class="col-sm-12 vertical-center">
<label for="group-access" class="control-label text-left col-sm-3 col-lg-2 !p-0">
Authorized users
<portainer-tooltip
ng-if="$ctrl.isAdmin && $ctrl.availableUsers.length > 0"
@ -115,9 +115,10 @@
<span ng-if="$ctrl.availableUsers.length === 0" class="small text-muted" style="margin-left: 20px">
You have not yet created any users. Head over to the <a ui-sref="portainer.users">Users view</a> to manage users.
</span>
<span
<div
isteven-multi-select
ng-if="$ctrl.availableUsers.length > 0"
class="col-sm-9 col-lg-10"
input-model="$ctrl.availableUsers"
output-model="$ctrl.formData.AuthorizedUsers"
button-label="Username"
@ -126,10 +127,9 @@
helper-elements="filter"
search-property="Username"
translation="{nothingSelected: 'Select one or more users', search: 'Search...'}"
style="margin-left: 20px"
data-cy="portainer-selectUserAccess"
>
</span>
</div>
</div>
</div>
<!-- !authorized-users -->