IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1254 from ONLYOFFICE/bugfix/chage-user-type

Browse Source 
Bugfix/chage user type
This commit is contained in:
Alexey Safronov 2023-03-01 12:28:30 +04:00 committed by GitHub
commit f04408ace1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
View File

@ -15,6 +15,7 @@ const ChangeUserTypeEvent = ({
peopleFilter,
updateUserType,
getUsersList,
onClose,
}) => {
const {
toType,
@ -58,7 +59,7 @@ const ChangeUserTypeEvent = ({
};
const onChangeUserType = () => {
onClose();
onClosePanel();
updateUserType(toType, userIDs, peopleFilter, fromType)
.then(() => {
toastr.success(t("SuccessChangeUserType"));
@ -83,14 +84,15 @@ const ChangeUserTypeEvent = ({
});
};
const onClose = () => {
const onClosePanel = () => {
setVisible(false);
onClose();
};
const onCloseAction = async () => {
await getUsersList(peopleFilter);
abortCallback && abortCallback();
onClose();
onClosePanel();
};
const getType = (type) => {
@ -99,6 +101,8 @@ const ChangeUserTypeEvent = ({
return t("Common:DocSpaceAdmin");
case "manager":
return t("Common:RoomAdmin");
case "collaborator":
return t("Common:Collaborator");
case "user":
default:
return t("Common:User");

10
packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
View File

@ -90,6 +90,8 @@ const User = ({
? "admin"
: option.key === "roomAdmin"
? "manager"
: option.key === "collaborator"
? "collaborator"
: "user";
const successCallback = () => {
@ -98,7 +100,13 @@ const User = ({
setIsLoading(true);
if (!changeUserType(userType, [user], successCallback, abortCallback)) {
const needChangeUserType =
((user.isVisitor || user.isCollaborator) && userType === "manager") ||
(user.isVisitor && userType === "collaborator");
if (needChangeUserType) {
changeUserType(userType, [user], successCallback, abortCallback);
} else {
updateRole(option);
}
};