diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-08-15 05:25:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-15 05:25:35 +0300 |
| commit | 74901290143ca65f6bc705ba1f9b4d3f0d1ae53d (patch) | |
| tree | 073a5d701a0839435645b907688603e10675672d /plugins/UsersManager | |
| parent | c5e749a2cb124bf735743af5dded5f8eacc75233 (diff) | |
Three small bug fixes (#13288)
* Fix two bugs in users manager component (bulk actions were limited to 100 rows and cancel link spanned whole container length).
* Add font styles to top of report link in email.
* remove commas
* Updated expected files.
* update tests again
* update test files again.
Diffstat (limited to 'plugins/UsersManager')
3 files changed, 6 insertions, 4 deletions
diff --git a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html index 048709081c..e21f61ab17 100644 --- a/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html +++ b/plugins/UsersManager/angularjs/user-edit-form/user-edit-form.component.html @@ -88,8 +88,8 @@ ng-if="$ctrl.currentUserRole == 'superuser' || $ctrl.isAdd" ></div> - <div class='entityCancel' ng-click="$ctrl.onDoneEditing({ isUserModified: $ctrl.isUserModified })" ng-if="$ctrl.isAdd"> - <a href="" class="entityCancelLink">{{:: 'General_Cancel'|translate }}</a> + <div class='entityCancel' ng-if="$ctrl.isAdd"> + <a href="" class="entityCancelLink" ng-click="$ctrl.onDoneEditing({ isUserModified: $ctrl.isUserModified })">{{:: 'General_Cancel'|translate }}</a> </div> </div> diff --git a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js index abebcb8235..a527b8ec81 100644 --- a/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js +++ b/plugins/UsersManager/angularjs/user-permissions-edit/user-permissions-edit.component.js @@ -119,7 +119,8 @@ method: 'UsersManager.getSitesAccessForUser', filter_search: vm.siteNameFilter, filter_access: vm.accessLevelFilter, - userLogin: vm.userLogin + userLogin: vm.userLogin, + filter_limit: '-1' }).then(function (access) { return access.map(function (a) { return a.idsite; }); }); diff --git a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js index cc89cbed1b..9b18e896ff 100644 --- a/plugins/UsersManager/angularjs/users-manager/users-manager.component.js +++ b/plugins/UsersManager/angularjs/users-manager/users-manager.component.js @@ -162,7 +162,8 @@ method: 'UsersManager.getUsersPlusRole', filter_search: vm.searchParams.filter_search, filter_access: vm.searchParams.filter_access, - idSite: vm.searchParams.idSite + idSite: vm.searchParams.idSite, + filter_limit: '-1' }); } |