rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-02-19 13:54:25 +01:00
Code Issues Releases Activity

(bug) disabling/removing groups

Browse Source 
When disabling a group, another unrelated group maybe disabled/enabled;
When deleting a group, another unrelated group may be deleted,
instead of the requested one
This commit is contained in:
Sylvain 2022-08-24 12:18:42 +02:00
parent 9674c4cddf
commit 9caf401412
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@
- Fix a bug: invalid password verification in setup script
- Fix a bug: during setup, unable to chown the installation folder, if the current user does not have a self-named group
- Fix a bug: during setup, the current value in config/env is not shown
- Fix a bug: disabling/removing a group has side effects on other groups
## v5.4.15 2022 August 1

15
app/frontend/src/javascript/controllers/admin/groups.js
View File

@ -70,20 +70,23 @@ Application.Controllers.controller('GroupsController', ['$scope', 'groupsPromise
/**
* Deletes the group at the specified index
* @param index {number} group index in the $scope.groups array
* @param groupId {number} group id to delete
*/
$scope.removeGroup = index =>
Group.delete({ id: $scope.groups[index].id }, function (resp) {
$scope.removeGroup = (groupId) => {
Group.delete({ id: groupId }, function (resp) {
growl.success(_t('app.admin.members.group_form.group_successfully_deleted'));
return $scope.groups.splice(index, 1);
const index = $scope.groups.findIndex(e => e.id === groupId);
$scope.groups.splice(index, 1);
}
, () => growl.error(_t('app.admin.members.group_form.unable_to_delete_group_because_some_users_and_or_groups_are_still_linked_to_it')));
};
/**
* Enable/disable the group at the specified index
* @param index {number} group index in the $scope.groups array
* @param groupId {number} id of the group to enable/disable
*/
return $scope.toggleDisableGroup = function (index) {
return $scope.toggleDisableGroup = function (groupId) {
const index = $scope.groups.findIndex(e => e.id === groupId);
const group = $scope.groups[index];
if (!group.disabled && (group.users > 0)) {
return growl.error(_t('app.admin.members.group_form.unable_to_disable_group_with_users', { USERS: group.users }));

4
app/frontend/templates/admin/groups/index.html
View File

@ -41,11 +41,11 @@
<button class="btn btn-default" ng-click="rowform.$show()">
<i class="fa fa-edit"></i> <span class="hidden-xs hidden-sm" translate>{{ 'app.shared.buttons.edit' }}</span>
</button>
<button class="btn btn-default" ng-click="toggleDisableGroup($index)">
<button class="btn btn-default" ng-click="toggleDisableGroup(group.id)">
<span ng-hide="group.disabled"><i class="fa fa-eye-slash"></i> <span translate>{{ 'app.admin.members.group_form.disable' }}</span></span>
<span ng-show="group.disabled"><i class="fa fa-eye"></i> <span translate>{{ 'app.admin.members.group_form.enable' }}</span></span>
</button>
<button class="btn btn-danger" ng-click="removeGroup($index)">
<button class="btn btn-danger" ng-click="removeGroup(group.id)">
<i class="fa fa-trash-o"></i>
</button>
</div>