jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

ldap: use separate objects for current config and user config

Browse Source
This commit is contained in:
Girish Ramakrishnan
2019-11-14 17:15:35 -08:00
parent 24ef877bfe
commit 200a234469
2 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/views/users.html
View File

@@ -482,59 +482,59 @@
<span class="text-muted">Provider</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.provider }}</span>
<span>{{ externalLdap.currentConfig.provider }}</span>
</div>
</div>
<div class="row" ng-show="externalLdap.provider !== 'noop'">
<div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
<div class="col-xs-6">
<span class="text-muted">Server URL</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.url }}</span>
<span>{{ externalLdap.currentConfig.url }}</span>
</div>
</div>
<div class="row" ng-show="externalLdap.provider !== 'noop'">
<div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
<div class="col-xs-6">
<span class="text-muted">Base DN</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.baseDn }}</span>
<span>{{ externalLdap.currentConfig.baseDn }}</span>
</div>
</div>
<div class="row" ng-show="externalLdap.provider !== 'noop'">
<div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
<div class="col-xs-6">
<span class="text-muted">Filter</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.filter }}</span>
<span>{{ externalLdap.currentConfig.filter }}</span>
</div>
</div>
<div class="row" ng-show="externalLdap.provider !== 'noop'">
<div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
<div class="col-xs-6">
<span class="text-muted">Username Field</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.usernameField || 'uid' }}</span>
<span>{{ externalLdap.currentConfig.usernameField || 'uid' }}</span>
</div>
</div>
<div class="row" ng-show="externalLdap.provider !== 'noop'">
<div class="row" ng-show="externalLdap.currentConfig.provider !== 'noop'">
<div class="col-xs-6">
<span class="text-muted">Auth</span>
</div>
<div class="col-xs-6 text-right">
<span>{{ externalLdap.bindDn ? 'Yes' : 'No' }}</span>
<span>{{ externalLdap.currentConfig.bindDn ? 'Yes' : 'No' }}</span>
</div>
</div>
<div class="row">
<br/>
<div class="col-md-12" style="margin-bottom: 10px;">
<div ng-show="externalLdap.busy" class="progress progress-striped active animateMe">
<div ng-show="externalLdap.syncBusy" class="progress progress-striped active animateMe">
<div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ externalLdap.percent }}%"></div>
</div>
</div>
@@ -542,15 +542,15 @@
<div class="row">
<div class="col-md-6">
<p ng-show="externalLdap.busy">{{ externalLdap.message }}</p>
<p ng-hide="externalLdap.busy">
<p ng-show="externalLdap.syncBusy">{{ externalLdap.message }}</p>
<p ng-hide="externalLdap.syncBusy">
<div class="has-error" ng-show="!externalLdap.active">{{ externalLdap.errorMessage }}</div>
</p>
</div>
<div class="col-md-6 text-right">
<button class="btn btn-primary pull-right" ng-click="externalLdap.show()">Configure</button>
<button class="btn btn-success pull-right" ng-disabled="externalLdap.provider === 'noop'" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.busy"></i> Synchronize</button>
<button class="btn btn-success pull-right" ng-disabled="externalLdap.currentConfig.provider === 'noop'" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> Synchronize</button>
<a class="btn btn-primary pull-right" ng-show="externalLdap.taskId" ng-href="/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">Show Logs</a>
</div>
</div>