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

Ensure groups configure dialogs have all users available

Browse Source
This commit is contained in:
Johannes Zellner
2019-11-05 22:08:48 +01:00
parent 71f1304606
commit 7040bb01f4
3 changed files with 63 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/js/client.js
+1 -1
View File
@@ -1028,7 +1028,7 @@ angular.module('Application').service('Client', ['$http', '$interval', '$timeout
callback = search; callback = search;
search = ''; search = '';
page = 1; page = 1;
perPage = 1000; perPage = 5000;
} }
var config = { var config = {
src/views/users.html
+2 -2
View File
@@ -183,7 +183,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">Users</label> <label class="control-label">Users</label>
<div class="control-label"> <div class="control-label">
<multiselect ng-model="groupAdd.selectedUsers" options="(user.username || user.email) for user in users" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect> <multiselect ng-model="groupAdd.selectedUsers" options="(user.username || user.email) for user in allUsers" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
</div> </div>
</div> </div>
<input class="hide" type="submit" ng-disabled="groupAddForm.$invalid || groupAdd.busy"/> <input class="hide" type="submit" ng-disabled="groupAddForm.$invalid || groupAdd.busy"/>
@@ -213,7 +213,7 @@
<div class="form-group"> <div class="form-group">
<label class="control-label">Users</label> <label class="control-label">Users</label>
<div class="control-label"> <div class="control-label">
<multiselect ng-model="groupEdit.selectedUsers" options="(user.username || user.email) for user in users" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect> <multiselect ng-model="groupEdit.selectedUsers" options="(user.username || user.email) for user in allUsers" data-compare-by="email" data-multiple="true" filter-after-rows="5" scroll-after-rows="10"></multiselect>
</div> </div>
</div> </div>
<input class="hide" type="submit" ng-disabled="groupEdit_form.$invalid || useredit.busy"/> <input class="hide" type="submit" ng-disabled="groupEdit_form.$invalid || useredit.busy"/>
src/views/users.js
+9
View File
@@ -27,6 +27,8 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
$scope.config = Client.getConfig(); $scope.config = Client.getConfig();
$scope.userInfo = Client.getUserInfo(); $scope.userInfo = Client.getUserInfo();
$scope.allUsers = [];
$scope.userSearchString = ''; $scope.userSearchString = '';
$scope.currentPage = 1; $scope.currentPage = 1;
$scope.pageItemCount = [ $scope.pageItemCount = [
@@ -642,6 +644,13 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
Client.onReady(refresh); Client.onReady(refresh);
Client.onReady(loadExternalLdapConfig); Client.onReady(loadExternalLdapConfig);
Client.onReady(function () {
Client.getUsers(function (error, results) {
if (error) return console.error(error);
$scope.allUsers = results;
});
});
// setup all the dialog focus handling // setup all the dialog focus handling
['userAddModal', 'userRemoveModal', 'userEditModal', 'groupAddModal', 'groupEditModal', 'groupRemoveModal'].forEach(function (id) { ['userAddModal', 'userRemoveModal', 'userEditModal', 'groupAddModal', 'groupEditModal', 'groupRemoveModal'].forEach(function (id) {