Skip to content

Commit

Permalink
Merge pull request #3950 from daguiler/bugfix/DNN-28527
Browse files Browse the repository at this point in the history
Prevent Role Groups dropdown expand on delete
  • Loading branch information
valadas authored Aug 15, 2020
2 parents dd4b618 + 5d8147a commit b098a16
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ class FiltersBar extends Component {
};
canEdit = util.settings.isHost || util.settings.isAdmin || util.settings.permissions.EDIT;
}
onDeleteGroup() {
onDeleteGroup(e) {
e.stopPropagation();

const {props} = this;
this.closeDropDown();
util.utilities.confirm(resx.get("DeleteRoleGroup.Confirm"), resx.get("Delete"), resx.get("Cancel"), () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ class RoleGroupEditor extends Component {
});
}

onCancel() {
onCancel(e) {
e.stopPropagation();

this.setState({
group: {}
}, () => {
Expand All @@ -68,7 +70,9 @@ class RoleGroupEditor extends Component {
});
}

onSave() {
onSave(e) {
e.stopPropagation();

const {props, state} = this;
this.submitted = true;
if (this.validateForm()) {
Expand Down

0 comments on commit b098a16

Please sign in to comment.