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

Merge pull request #2066 from ONLYOFFICE/feature/fix-bugs

Browse source 
Feature/fix bugs
This commit is contained in:
maxkadushkin 2022-11-18 20:04:38 +03:00 committed by GitHub
parent d57e35789d bdf39b536f
commit 3f5fb3deb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/common/mobile/lib/view/SharingSettings.jsx
View file

@ -6,17 +6,18 @@ import { Device } from "../../utils/device";
const SharingSettings = props => {
const { t } = useTranslation();
const storeAppOptions = props.storeAppOptions;
const sharingSettingsUrl = storeAppOptions.sharingSettingsUrl;
const _t = t('Common.Collaboration', {returnObjects: true});
const url = 'https://nct.onlyoffice.com/Products/Files/Share.aspx?fileid=142278';
return (
<Page>
<Navbar title={t('Common.Collaboration.textSharingSettings')} backLink={_t.textBack} />
<div id="sharing-placeholder" className="sharing-placeholder">
<iframe width="100%" height="100%" frameBorder={0} scrolling="0" align="top" src={url}></iframe>
<iframe width="100%" height="100%" frameBorder={0} scrolling="0" align="top" src={sharingSettingsUrl}></iframe>
</div>
</Page>
)
}
export default SharingSettings;
export default inject("storeAppOptions")(observer(SharingSettings));

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

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

14
apps/documenteditor/mobile/src/view/edit/Edit.jsx
View file

@ -339,13 +339,6 @@ const EditTabs = props => {
component: <EditHeaderController />
})
}
if (settings.indexOf('paragraph') > -1) {
editors.push({
caption: _t.textParagraph,
id: 'edit-paragraph',
component: <EditParagraphController />
})
}
if (settings.indexOf('text') > -1) {
editors.push({
caption: _t.textText,
@ -353,6 +346,13 @@ const EditTabs = props => {
component: <EditTextController />
})
}
if (settings.indexOf('paragraph') > -1) {
editors.push({
caption: _t.textParagraph,
id: 'edit-paragraph',
component: <EditParagraphController />
})
}
}
return (

3
apps/documenteditor/mobile/src/view/settings/Settings.jsx
View file

@ -191,9 +191,6 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
onClick={onoptionclick.bind(this, "/application-settings/")}>
<Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem>
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="#" onClick={onoptionclick.bind(this, "/sharing-settings/")}>
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
{_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, "/download/")}>
<Icon slot="media" icon="icon-download"></Icon>

10
apps/presentationeditor/mobile/src/view/settings/Settings.jsx
View file

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

10
apps/spreadsheeteditor/mobile/src/view/settings/Settings.jsx
View file

@ -67,13 +67,6 @@ const routes = [
{
path: '/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/')}>
<Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem>
<ListItem title={t('Common.Collaboration.textSharingSettings')} link="#" onClick={onoptionclick.bind(this, "/sharing-settings/")}>
<Icon slot="media" icon="icon-sharing-settings"></Icon>
</ListItem>
{_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, '/download/')}>
<Icon slot="media" icon="icon-download"></Icon>