mirror of https://github.com/portainer/portainer
Merge branch 'oath-poc' of github.com:portainer/pportainer into oath-poc
Anthony Lapenna
commit
16226b1202
|
|
@ -1,5 +1,45 @@
|
||||||
<div>
|
<div>
|
||||||
<!-- <oauth-providers-selector on-select="$ctrl.onSelectProvider" selected-provider="$ctrl.settings.provider" providers="$ctrl.providers"></oauth-providers-selector> -->
|
<!-- <oauth-providers-selector on-select="$ctrl.onSelectProvider" selected-provider="$ctrl.settings.provider" providers="$ctrl.providers"></oauth-providers-selector> -->
|
||||||
|
<div class="col-sm-12 form-section-title">
|
||||||
|
Automatic user provisioning
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<span class="col-sm-12 text-muted small">
|
||||||
|
With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role. If
|
||||||
|
disabled, users must be created in Portainer in order to login.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="col-sm-12">
|
||||||
|
<label for="oauth_provisioning"> Automatic user provisioning </label>
|
||||||
|
<label class="switch" style="margin-left: 20px">
|
||||||
|
<input type="checkbox" ng-model="$ctrl.settings.OAuthAutoCreateUsers" /><i></i>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div ng-if="$ctrl.settings.OAuthAutoCreateUsers">
|
||||||
|
<div class="form-group">
|
||||||
|
<span class="col-sm-12 text-muted small">
|
||||||
|
The users created by the automatic provisioning feature can be added to a default team on creation. This setting is optional.
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label for="team_provisioning" class="col-sm-2">Default team</label>
|
||||||
|
<span class="small text-muted" style="margin-left: 20px;" ng-if="$ctrl.teams.length === 0">
|
||||||
|
You have not yet created any team. Head over the <a ui-sref="portainer.teams">teams view</a> to manage user teams.
|
||||||
|
</span>
|
||||||
|
<button type="button" class="btn btn-sm btn-danger" ng-click="$ctrl.settings.DefaultTeamID = null" ng-disabled="!$ctrl.settings.DefaultTeamID"
|
||||||
|
ng-if="$ctrl.teams.length > 0">
|
||||||
|
<i class="fa fa-times" aria-hidden="true"></i>
|
||||||
|
</button>
|
||||||
|
<div class="col-sm-9 col-lg-9" ng-if="$ctrl.teams.length > 0">
|
||||||
|
<select class="form-control" ng-model="$ctrl.settings.DefaultTeamID" ng-options="team.Id as team.Name for team in $ctrl.teams">
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<div class="col-sm-12 form-section-title">OAuth Configuration</div>
|
<div class="col-sm-12 form-section-title">OAuth Configuration</div>
|
||||||
|
|
||||||
|
|
@ -148,43 +188,4 @@
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-12 form-section-title">
|
|
||||||
Automatic user provisioning
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<span class="col-sm-12 text-muted small">
|
|
||||||
With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role. If
|
|
||||||
disabled, users must be created in Portainer in order to login.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="col-sm-12">
|
|
||||||
<label for="oauth_provisioning"> Automatic user provisioning </label>
|
|
||||||
<label class="switch" style="margin-left: 20px">
|
|
||||||
<input type="checkbox" ng-model="$ctrl.settings.OAuthAutoCreateUsers" /><i></i>
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div ng-if="$ctrl.settings.OAuthAutoCreateUsers">
|
|
||||||
<div class="form-group">
|
|
||||||
<span class="col-sm-12 text-muted small">
|
|
||||||
The users created by the automatic provisioning feature can be added to a default team on creation. This setting is optional.
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label for="team_provisioning" class="col-sm-2 col-lg-1">Default team</label>
|
|
||||||
<div class="col-sm-1">
|
|
||||||
<button type="button" class="btn btn-sm btn-danger pull-right" ng-click="$ctrl.settings.DefaultTeamID = null"
|
|
||||||
ng-disabled="!$ctrl.settings.DefaultTeamID">
|
|
||||||
<i class="fa fa-times" aria-hidden="true"></i>
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<div class="col-sm-9 col-lg-10">
|
|
||||||
<select class="form-control" ng-model="$ctrl.settings.DefaultTeamID" ng-options="team.Id as team.Name for team in $ctrl.teams">
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@
|
||||||
<!-- !login panel -->
|
<!-- !login panel -->
|
||||||
<div class="panel panel-default" ng-show="state.isInOAuthProcess">
|
<div class="panel panel-default" ng-show="state.isInOAuthProcess">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
<div class="form-group">
|
<div class="form-group text-center">
|
||||||
Connecting with OAuth <span class="pull-right" button-spinner="true"></span>
|
<span class="small text-muted">Connecting with OAuth <span button-spinner="true"></span></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue