Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
This commit is contained in:
commit
ed4269eb83
@ -6,7 +6,7 @@ import { Layout, Toast } from 'asc-web-components';
|
||||
import { logout } from '../../store/auth/actions';
|
||||
import { withTranslation, I18nextProvider } from 'react-i18next';
|
||||
import i18n from "./i18n";
|
||||
import { isAdmin } from "../../store/auth/selectors";
|
||||
//import { isAdmin } from "../../store/auth/selectors";
|
||||
|
||||
class PurePeopleLayout extends React.Component {
|
||||
shouldComponentUpdate(nextProps) {
|
||||
@ -68,7 +68,7 @@ class PurePeopleLayout extends React.Component {
|
||||
|
||||
|
||||
const getAvailableModules = (modules, currentUser) => {
|
||||
const isUserAdmin = isAdmin(currentUser);
|
||||
const isUserAdmin = currentUser.isAdmin;
|
||||
const customModules = isUserAdmin ? [
|
||||
{
|
||||
separator: true,
|
||||
|
@ -1,6 +1,6 @@
|
||||
import React, { useCallback } from "react";
|
||||
import { withRouter } from "react-router";
|
||||
import { RowContent, Link, LinkWithDropdown, Icons, toastr, Text } from "asc-web-components";
|
||||
import { RowContent, Link, LinkWithDropdown, Icons, Text } from "asc-web-components";
|
||||
import { connect } from "react-redux";
|
||||
import { getUserStatus } from "../../../../../store/people/selectors";
|
||||
import { useTranslation } from 'react-i18next';
|
||||
@ -60,11 +60,6 @@ const UserContent = ({ user, history, settings }) => {
|
||||
[history, settings.homepage, userName]
|
||||
);
|
||||
|
||||
const onUserTitleClick = useCallback(
|
||||
() => toastr.success(`Filter action by user title: ${title}`),
|
||||
[title]
|
||||
);
|
||||
|
||||
const onPhoneClick = useCallback(
|
||||
() => window.open(`sms:${mobilePhone}`),
|
||||
[mobilePhone]
|
||||
@ -77,7 +72,7 @@ const UserContent = ({ user, history, settings }) => {
|
||||
|
||||
const nameColor = status === 'pending' ? '#A3A9AE' : '#333333';
|
||||
const sideInfoColor = status === 'pending' ? '#D0D5DA' : '#A3A9AE';
|
||||
const { t } = useTranslation();
|
||||
//const { t } = useTranslation();
|
||||
|
||||
const headDepartmentStyle = {
|
||||
width: '110px'
|
||||
|
@ -104,7 +104,7 @@ class SectionBodyContent extends React.PureComponent {
|
||||
)}
|
||||
</AvatarWrapper>
|
||||
<ProfileInfo profile={profile} updateProfileCulture={updateProfileCulture} isSelf={isSelf} isAdmin={isAdmin} t={t} cultures={settings.cultures} culture={settings.culture} />
|
||||
{isSelf && (
|
||||
{(isSelf && false) && (
|
||||
<ToggleWrapper isSelf={true} >
|
||||
<ToggleContent label={t('Subscriptions')} isOpen={true} >
|
||||
<Text.Body as="span">
|
||||
|
@ -7,7 +7,7 @@ import { logout } from "../../store/auth/actions";
|
||||
import { withTranslation, I18nextProvider } from 'react-i18next';
|
||||
import i18n from "./i18n";
|
||||
import isEqual from "lodash/isEqual";
|
||||
import { isAdmin } from "../../store/auth/selectors";
|
||||
//import { isAdmin } from "../../store/auth/selectors";
|
||||
|
||||
class PureStudioLayout extends React.Component {
|
||||
shouldComponentUpdate(nextProps, nextState) {
|
||||
@ -64,7 +64,7 @@ class PureStudioLayout extends React.Component {
|
||||
|
||||
|
||||
const getAvailableModules = (modules, currentUser) => {
|
||||
const isUserAdmin = isAdmin(currentUser);
|
||||
const isUserAdmin = currentUser.isAdmin;
|
||||
const separator = { separator: true, id: "nav-separator-1" };
|
||||
const customModules = isUserAdmin ? [
|
||||
{
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "asc-web-components",
|
||||
"version": "1.0.160",
|
||||
"version": "1.0.161",
|
||||
"description": "Ascensio System SIA component library",
|
||||
"license": "AGPL-3.0",
|
||||
"main": "dist/asc-web-components.js",
|
||||
|
@ -58,7 +58,7 @@ class ProfileActions extends React.PureComponent {
|
||||
|
||||
getUserRole = user => {
|
||||
if (user.isOwner) return "owner";
|
||||
if (user.isAdmin) return "admin";
|
||||
if (user.isAdmin || user.listAdminModules.length) return "admin";
|
||||
if (user.isVisitor) return "guest";
|
||||
return "user";
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user