IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.0.0' of github.com:ONLYOFFICE/AppServer into release/v1.0.0

Browse Source
This commit is contained in:
Vlada Gazizova 2023-03-21 10:43:57 +03:00
commit 48b668ff4a
5 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/components/Article/Body/Items.js
View File

@ -367,7 +367,8 @@ const Items = ({
);
});
if (!firstLoad) items.splice(3, 0, <SettingsItem key="settings-item" />);
if (!firstLoad && !isVisitor)
items.splice(3, 0, <SettingsItem key="settings-item" />);
if (!isVisitor && !isCollaborator)
items.splice(3, 0, <AccountsItem key="accounts-item" />);

8
packages/client/src/pages/Files.jsx
View File

@ -73,7 +73,7 @@ const FilesArticle = React.memo(({ history, withMainButton }) => {
);
});
const FilesSection = React.memo(() => {
const FilesSection = React.memo(({ withMainButton }) => {
return (
<Switch>
{/*<PrivateRoute exact path={HISTORY_URL} component={VersionHistory} />*/}
@ -148,7 +148,9 @@ const FilesSection = React.memo(() => {
path={"/settings/admin"}
component={Settings}
/>
<PrivateRoute exact path={"/settings/common"} component={Settings} />
{withMainButton && (
<PrivateRoute exact path={"/settings/common"} component={Settings} />
)}
<PrivateRoute component={Error404Route} />
</Switch>
);
@ -232,7 +234,7 @@ class FilesContent extends React.Component {
) : (
<FilesArticle history={history} withMainButton={withMainButton} />
)}
<FilesSection />
<FilesSection withMainButton={withMainButton} />
</>
);
}

42
packages/client/src/pages/Settings/Section/Body/CommonSettings.js
View File

@ -153,25 +153,29 @@ const PersonalSettings = ({
/>
</Box> */}
<Box className="settings-section">
<Heading className="heading" level={2} size="xsmall">
{t("StoringFileVersion")}
</Heading>
{!isVisitor && (
<ToggleButton
className="toggle-btn"
label={t("UpdateOrCreate")}
onChange={onChangeUpdateIfExist}
isChecked={updateIfExist}
/>
)}
<ToggleButton
className="toggle-btn"
label={t("KeepIntermediateVersion")}
onChange={onChangeForceSave}
isChecked={forceSave}
/>
</Box>
{!isVisitor && (
<Box className="settings-section">
<Heading className="heading" level={2} size="xsmall">
{t("StoringFileVersion")}
</Heading>
{!isVisitor && (
<ToggleButton
className="toggle-btn"
label={t("UpdateOrCreate")}
onChange={onChangeUpdateIfExist}
isChecked={updateIfExist}
/>
)}
{!isVisitor && (
<ToggleButton
className="toggle-btn"
label={t("KeepIntermediateVersion")}
onChange={onChangeForceSave}
isChecked={forceSave}
/>
)}
</Box>
)}
</StyledSettings>
);
};

2
packages/common/components/LoginContainer/index.js
View File

@ -6,7 +6,7 @@ const LoginContainer = styled.div`
display: flex;
flex-direction: column;
align-items: center;
margin: 56px auto;
margin: 56px auto 0 auto;
max-width: 960px;
z-index: 0;

31
packages/editor/src/server/lib/helpers/index.js
View File

@ -109,15 +109,32 @@ export const initDocEditor = async (req) => {
// logoUrls[index].path.light = getLogoFromPath(logo.path.dark);
// });
config.editorConfig.customization.logo.image =
config.editorConfig.customization.logo.url +
getLogoFromPath(config.editorConfig.customization.logo.image);
// change only for default logo
if (
config?.editorConfig?.customization?.logo?.image.indexOf("images/logo/") >
-1
) {
config.editorConfig.customization.logo.image =
config.editorConfig.customization.logo.url +
getLogoFromPath(config.editorConfig.customization.logo.image);
}
config.editorConfig.customization.logo.imageDark =
config.editorConfig.customization.logo.url +
getLogoFromPath(config.editorConfig.customization.logo.imageDark);
// change only for default logo
if (
config?.editorConfig?.customization?.logo?.imageDark.indexOf(
"images/logo/"
) > -1
) {
config.editorConfig.customization.logo.imageDark =
config.editorConfig.customization.logo.url +
getLogoFromPath(config.editorConfig.customization.logo.imageDark);
}
if (config.editorConfig.customization.customer) {
if (
config.editorConfig.customization.customer &&
config.editorConfig.customization.customer.logo.indexOf("images/logo/") >
-1
) {
config.editorConfig.customization.customer.logo =
config.editorConfig.customization.logo.url +
getLogoFromPath(config.editorConfig.customization.customer.logo);