Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE mobile] Fix Bug 59855

Browse source
This commit is contained in:
SergeyEzhin 2022-12-13 19:43:12 +04:00
parent 8c7a5bafef
commit 5bade65f02
4 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/common/mobile/lib/view/collaboration/Collaboration.jsx
View file

@ -92,6 +92,9 @@ 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 documentInfo = props.documentInfo;
const dataDoc = documentInfo && documentInfo.dataDoc;
const fileType = dataDoc && dataDoc.fileType;
const sharingSettingsUrl = appOptions.sharingSettingsUrl; const sharingSettingsUrl = appOptions.sharingSettingsUrl;
const isViewer = appOptions.isViewer; const isViewer = appOptions.isViewer;
@ -108,7 +111,7 @@ const PageCollaboration = inject('storeAppOptions', 'users')(observer(props => {
} }
</Navbar> </Navbar>
<List> <List>
{sharingSettingsUrl && {(sharingSettingsUrl && fileType !== 'oform') &&
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/"> <ListItem title={t('Common.Collaboration.textSharingSettings')} link="/sharing-settings/">
<Icon slot="media" icon="icon-sharing-settings"></Icon> <Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem> </ListItem>
@ -148,10 +151,10 @@ class CollaborationView extends Component {
return ( return (
show_popover ? show_popover ?
<Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()} closeByOutsideClick={false}> <Popover id="coauth-popover" className="popover__titled" onPopoverClosed={() => this.props.onclosed()} closeByOutsideClick={false}>
<PageCollaboration style={{height: '410px'}} page={this.props.page}/> <PageCollaboration documentInfo={this.props.documentInfo} style={{height: '410px'}} page={this.props.page}/>
</Popover> : </Popover> :
<Sheet className="coauth__sheet" push onSheetClosed={() => this.props.onclosed()}> <Sheet className="coauth__sheet" push onSheetClosed={() => this.props.onclosed()}>
<PageCollaboration page={this.props.page}/> <PageCollaboration documentInfo={this.props.documentInfo} page={this.props.page}/>
</Sheet> </Sheet>
) )
} }
@ -177,9 +180,9 @@ const Collaboration = props => {
}; };
return ( return (
<CollaborationView usePopover={!Device.phone} onclosed={onviewclosed} page={props.page}/> <CollaborationView usePopover={!Device.phone} documentInfo={props.storeDocumentInfo} onclosed={onviewclosed} page={props.page}/>
) )
}; };
export {PageCollaboration} const CollaborationDocument = inject('storeDocumentInfo')(observer(Collaboration));
export default Collaboration; export {Collaboration, CollaborationDocument};

5
apps/documenteditor/mobile/src/page/main.jsx
View file

@ -7,7 +7,7 @@ import { withTranslation } from 'react-i18next';
import EditOptions from '../view/edit/Edit'; import EditOptions from '../view/edit/Edit';
import AddOptions from '../view/add/Add'; import AddOptions from '../view/add/Add';
import Settings from '../controller/settings/Settings'; import Settings from '../controller/settings/Settings';
import Collaboration from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx' import { CollaborationDocument } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
import { Device } from '../../../../common/mobile/utils/device' import { Device } from '../../../../common/mobile/utils/device'
import { Search, SearchSettings } from '../controller/Search'; import { Search, SearchSettings } from '../controller/Search';
import ContextMenu from '../controller/ContextMenu'; import ContextMenu from '../controller/ContextMenu';
@ -229,8 +229,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} <CollaborationDocument onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} page={this.state.collaborationPage} />
page={this.state.collaborationPage}/>
} }
{ {
!this.state.navigationVisible ? null : !this.state.navigationVisible ? null :

4
apps/presentationeditor/mobile/src/page/main.jsx
View file

@ -6,7 +6,7 @@ import { Device } from '../../../../common/mobile/utils/device';
import EditOptions from '../view/edit/Edit'; import EditOptions from '../view/edit/Edit';
import AddOptions from '../view/add/Add'; import AddOptions from '../view/add/Add';
import Settings from '../view/settings/Settings'; import Settings from '../view/settings/Settings';
import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'; import { Collaboration } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx';
import { Preview } from "../controller/Preview"; import { Preview } from "../controller/Preview";
import { Search, SearchSettings } from '../controller/Search'; import { Search, SearchSettings } from '../controller/Search';
import ContextMenu from '../controller/ContextMenu'; import ContextMenu from '../controller/ContextMenu';
@ -179,7 +179,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
{appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />} {appOptions.isDocReady && <ContextMenu openOptions={this.handleClickToOpenOptions.bind(this)} />}
</Page> </Page>

4
apps/spreadsheeteditor/mobile/src/page/main.jsx
View file

@ -4,7 +4,7 @@ import { observer, inject } from "mobx-react";
import { Device } from '../../../../common/mobile/utils/device'; import { Device } from '../../../../common/mobile/utils/device';
import Settings from '../view/settings/Settings'; import Settings from '../view/settings/Settings';
import CollaborationView from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx' import { Collaboration } from '../../../../common/mobile/lib/view/collaboration/Collaboration.jsx'
import CellEditor from '../controller/CellEditor'; import CellEditor from '../controller/CellEditor';
import { Statusbar } from '../controller/Statusbar'; import { Statusbar } from '../controller/Statusbar';
import FilterOptionsController from '../controller/FilterOptions.jsx' import FilterOptionsController from '../controller/FilterOptions.jsx'
@ -167,7 +167,7 @@ class MainPage extends Component {
} }
{ {
!this.state.collaborationVisible ? null : !this.state.collaborationVisible ? null :
<CollaborationView onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} /> <Collaboration onclosed={this.handleOptionsViewClosed.bind(this, 'coauth')} />
} }
{appOptions.isDocReady && {appOptions.isDocReady &&