Merge pull request #187 from ONLYOFFICE/feature/access-rights-fix

Feature/access rights fix
This commit is contained in:
Artem Tarasov 2021-02-03 17:03:33 +03:00 committed by GitHub
commit 317518f45d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 10 deletions

View File

@ -148,6 +148,7 @@ class AddGroupsPanelComponent extends React.Component {
<StyledBody ref={this.scrollRef}>
<GroupSelector
className="groupSelector"
isOpen={visible}
isMultiSelect
displayType="aside"
@ -160,6 +161,7 @@ class AddGroupsPanelComponent extends React.Component {
directionX="right"
onAccessChange={this.onAccessChange}
accessOptions={accessOptions}
arrowIconColor="#000000"
/>
}
showCounter

View File

@ -140,6 +140,7 @@ class AddUsersPanelComponent extends React.Component {
directionX="right"
onAccessChange={this.onAccessChange}
accessOptions={accessOptions}
arrowIconColor="#000000"
/>
),
}
@ -180,6 +181,7 @@ class AddUsersPanelComponent extends React.Component {
<StyledBody ref={this.scrollRef}>
<PeopleSelector
className="peopleSelector"
role={isMultiSelect ? null : "user"}
employeeStatus={1}
displayType="aside"

View File

@ -14,6 +14,7 @@ const AccessComboBox = (props) => {
itemId,
onAccessChange,
t,
arrowIconColor,
} = props;
const {
FullAccess,
@ -100,12 +101,15 @@ const AccessComboBox = (props) => {
);
const accessIcon = getAccessIcon(access);
const selectedOption = arrowIconColor
? { key: 0, arrowIconColor }
: { key: 0 };
return (
<ComboBox
advancedOptions={advancedOptions}
options={[]}
selectedOption={{ key: 0 }}
selectedOption={selectedOption}
size="content"
className="panel_combo-box"
scaled={false}

View File

@ -47,9 +47,11 @@ class LinkRow extends React.Component {
isDisabled={isDisabled}
/>
) : (
<Icons.AccessEditIcon
<Icons.InvitationLinkIcon
size="medium"
className="sharing_panel-owner-icon"
isfill={true}
color="#A3A9AE"
/>
)
}

View File

@ -7,14 +7,7 @@ const PanelStyles = css`
.optionalBlock {
margin-right: 4px;
}
&.add-groups {
.combo-buttons_arrow-icon {
flex: 0 0 5px;
width: 5px;
margin-top: 16px;
}
display: flex;
}
.combo-button {
@ -26,6 +19,19 @@ const PanelStyles = css`
}
}
.groupSelector,
.peopleSelector {
.combo-buttons_arrow-icon {
flex: 0 0 6px;
width: 6px;
margin-top: auto;
margin-bottom: auto;
display: flex;
justify-content: center;
align-items: center;
}
}
.footer {
padding: 16px 0;
width: calc(100% - 32px);