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

rename directoryConfig to profileConfig

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-01-13 14:40:07 -08:00
parent e0b6ce9bd8
commit 2085a4a7d4
3 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/users.html
View File

@@ -721,16 +721,16 @@
</div>
<div class="card card-large" ng-show="user.isAtLeastAdmin">
<form name="directoryConfigForm" role="form" novalidate ng-submit="directoryConfig.submit()" autocomplete="off">
<fieldset ng-disabled="directoryConfig.busy || !config.features.directoryConfig">
<form name="profileConfigForm" role="form" novalidate ng-submit="profileConfig.submit()" autocomplete="off">
<fieldset ng-disabled="profileConfig.busy || !config.features.profileConfig">
<div class="checkbox">
<label>
<input type="checkbox" ng-model="directoryConfig.editableUserProfiles"> {{ 'users.settings.allowProfileEditCheckbox' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#lock-profile" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
<input type="checkbox" ng-model="profileConfig.editableUserProfiles"> {{ 'users.settings.allowProfileEditCheckbox' | tr }} <sup><a ng-href="https://docs.cloudron.io/user-management/#lock-profile" class="help" target="_blank"><i class="fa fa-question-circle"></i></a></sup>
</label>
</div>
<div class="checkbox">
<label>
<input type="checkbox" ng-model="directoryConfig.mandatory2FA"> {{ 'users.settings.require2FACheckbox' | tr }}
<input type="checkbox" ng-model="profileConfig.mandatory2FA"> {{ 'users.settings.require2FACheckbox' | tr }}
</label>
</div>
</fieldset>
@@ -738,18 +738,18 @@
<br/>
<div class="row" ng-hide="config.features.directoryConfig">
<div class="row" ng-hide="config.features.profileConfig">
<div class="col-md-12">
<span>{{ 'users.settings.subscriptionRequired' | tr }} <a href="" class="pull-right" ng-click="openSubscriptionSetup()">{{ 'users.settings.subscriptionRequiredAction' | tr }}</a></span>
</div>
</div>
<div class="row" ng-show="config.features.directoryConfig">
<div class="row" ng-show="config.features.profileConfig">
<div class="col-md-12">
<span class="has-error" ng-show="directoryConfig.errorMessage">{{ directoryConfig.errorMessage }}</span>
<span class="has-error" ng-show="profileConfig.errorMessage">{{ profileConfig.errorMessage }}</span>
<button class="btn btn-outline btn-primary pull-right" ng-click="directoryConfig.submit()" ng-disabled="!directoryConfigForm.$dirty || directoryConfig.busy">
<i class="fa fa-circle-notch fa-spin" ng-show="directoryConfig.busy"></i> {{ 'users.settings.saveAction' | tr }}
<button class="btn btn-outline btn-primary pull-right" ng-click="profileConfig.submit()" ng-disabled="!profileConfigForm.$dirty || profileConfig.busy">
<i class="fa fa-circle-notch fa-spin" ng-show="profileConfig.busy"></i> {{ 'users.settings.saveAction' | tr }}
</button>
</div>
</div>

32
src/views/users.js
View File

@@ -755,40 +755,40 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
}
};
$scope.directoryConfig = {
$scope.profileConfig = {
editableUserProfiles: true,
mandatory2FA: false,
errorMessage: '',
refresh: function () {
Client.getDirectoryConfig(function (error, result) {
Client.getProfileConfig(function (error, result) {
if (error) return console.error('Unable to get directory config.', error);
$scope.directoryConfig.editableUserProfiles = !result.lockUserProfiles;
$scope.directoryConfig.mandatory2FA = !!result.mandatory2FA;
$scope.profileConfig.editableUserProfiles = !result.lockUserProfiles;
$scope.profileConfig.mandatory2FA = !!result.mandatory2FA;
});
},
submit: function () {
$scope.directoryConfig.error = '';
$scope.directoryConfig.busy = true;
$scope.directoryConfig.success = false;
$scope.profileConfig.error = '';
$scope.profileConfig.busy = true;
$scope.profileConfig.success = false;
var data = {
lockUserProfiles: !$scope.directoryConfig.editableUserProfiles,
mandatory2FA: $scope.directoryConfig.mandatory2FA
lockUserProfiles: !$scope.profileConfig.editableUserProfiles,
mandatory2FA: $scope.profileConfig.mandatory2FA
};
Client.setDirectoryConfig(data, function (error) {
if (error) $scope.directoryConfig.errorMessage = error.message;
Client.setProfileConfig(data, function (error) {
if (error) $scope.profileConfig.errorMessage = error.message;
$scope.directoryConfig.success = true;
$scope.profileConfig.success = true;
$scope.directoryConfigForm.$setUntouched();
$scope.directoryConfigForm.$setPristine();
$scope.profileConfigForm.$setUntouched();
$scope.profileConfigForm.$setPristine();
$timeout(function () {
$scope.directoryConfig.busy = false;
$scope.profileConfig.busy = false;
}, 3000);
});
}
@@ -1076,7 +1076,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
Client.onReady(function () {
refresh();
if ($scope.user.isAtLeastAdmin) loadExternalLdapConfig();
if ($scope.user.isAtLeastAdmin) $scope.directoryConfig.refresh();
if ($scope.user.isAtLeastAdmin) $scope.profileConfig.refresh();
if ($scope.user.isAtLeastAdmin) $scope.userDirectoryConfig.refresh();
refreshAllUsers();