[DE PE SSE mobile] Fix Bug 59732

This commit is contained in:
SergeyEzhin 2022-11-18 15:59:43 +04:00
parent 102b6692fd
commit 31b901fa6b
4 changed files with 11 additions and 29 deletions

View file

@ -4,11 +4,10 @@ import { Popover, List, ListItem, Navbar, NavRight, Sheet, BlockTitle, Page, Vie
import { f7 } from 'framework7-react'; import { f7 } from 'framework7-react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
import {Device} from "../../../utils/device"; import {Device} from "../../../utils/device";
import {ReviewController, ReviewChangeController} from "../../controller/collaboration/Review"; import {ReviewController, ReviewChangeController} from "../../controller/collaboration/Review";
import {PageDisplayMode} from "./Review"; import {PageDisplayMode} from "./Review";
import {ViewCommentsController, ViewCommentsSheetsController} from "../../controller/collaboration/Comments"; import {ViewCommentsController, ViewCommentsSheetsController} from "../../controller/collaboration/Comments";
import SharingSettings from "../SharingSettings";
const PageUsers = inject("users")(observer(props => { const PageUsers = inject("users")(observer(props => {
const { t } = useTranslation(); const { t } = useTranslation();
@ -81,6 +80,10 @@ const routes = [
allComments: true allComments: true
} }
} }
},
{
path: '/sharing-settings/',
component: SharingSettings
} }
]; ];
@ -88,6 +91,7 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Common.Collaboration', {returnObjects: true}); const _t = t('Common.Collaboration', {returnObjects: true});
const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
const sharingSettingsUrl = appOptions.sharingSettingsUrl;
const isViewer = appOptions.isViewer; const isViewer = appOptions.isViewer;
return ( return (
@ -103,6 +107,11 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
} }
</Navbar> </Navbar>
<List> <List>
{sharingSettingsUrl &&
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/">
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
}
{props.users.editUsers.length > 0 && {props.users.editUsers.length > 0 &&
<ListItem link={'/users/'} title={_t.textUsers}> <ListItem link={'/users/'} title={_t.textUsers}>
<Icon slot="media" icon="icon-users"></Icon> <Icon slot="media" icon="icon-users"></Icon>

View file

@ -84,7 +84,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Settings', {returnObjects: true}); const _t = t('Settings', {returnObjects: true});
const appOptions = props.storeAppOptions; const appOptions = props.storeAppOptions;
const sharingSettingsUrl = appOptions.sharingSettingsUrl;
const storeReview = props.storeReview; const storeReview = props.storeReview;
const displayMode = storeReview.displayMode; const displayMode = storeReview.displayMode;
const navbar = <Navbar title={_t.textSettings}> const navbar = <Navbar title={_t.textSettings}>
@ -192,12 +191,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
onClick={onoptionclick.bind(this, "/application-settings/")}> onClick={onoptionclick.bind(this, "/application-settings/")}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>
{sharingSettingsUrl &&
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="#"
onClick={onoptionclick.bind(this, "/sharing-settings/")}>
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
}
{_canDownload && {_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, "/download/")}> <ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, "/download/")}>
<Icon slot="media" icon="icon-download"></Icon> <Icon slot="media" icon="icon-download"></Icon>

View file

@ -47,13 +47,6 @@ const routes = [
path: '/about/', path: '/about/',
component: About component: About
}, },
// Sharing Settings
{
path: '/sharing-settings/',
component: SharingSettings
}
/*{ /*{
path: '/presentation-settings/', path: '/presentation-settings/',
component: PresentationSettingsController, component: PresentationSettingsController,
@ -186,9 +179,6 @@ const SettingsList = inject("storeAppOptions", "storeToolbarSettings")(observer(
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="#" onClick={onoptionclick.bind(this, "/sharing-settings/")}>
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
{_canDownload && {_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, '/download/')}> <ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, '/download/')}>
<Icon slot="media" icon="icon-download"></Icon> <Icon slot="media" icon="icon-download"></Icon>

View file

@ -67,13 +67,6 @@ const routes = [
{ {
path: '/direction/', path: '/direction/',
component: Direction component: Direction
},
// Sharing Settings
{
path: '/sharing-settings/',
component: SharingSettings
} }
]; ];
@ -196,9 +189,6 @@ const SettingsList = inject("storeAppOptions")(observer(props => {
<ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}> <ListItem title={_t.textApplicationSettings} link="#" onClick={onoptionclick.bind(this, '/application-settings/')}>
<Icon slot="media" icon="icon-app-settings"></Icon> <Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem> </ListItem>
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="#" onClick={onoptionclick.bind(this, "/sharing-settings/")}>
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
{_canDownload && {_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, '/download/')}> <ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, '/download/')}>
<Icon slot="media" icon="icon-download"></Icon> <Icon slot="media" icon="icon-download"></Icon>