haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

Merge branch '10.0'

Browse Source
This commit is contained in:
lian
2023-11-10 11:04:10 +08:00
parent f1281a18ad 845f543643
commit b9884eaff7
10 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/components/logo.js
View File

@@ -17,7 +17,7 @@ class Logo extends React.Component {
return (
<div className="top-logo">
<a href={siteRoot} id="logo">
<img src={mediaUrl + logoPath} height={logoHeight} width={logoWidth} title={siteTitle} alt="logo" />
<img src={logoPath.indexOf('image-view') != -1 ? logoPath : mediaUrl + logoPath} height={logoHeight} width={logoWidth} title={siteTitle} alt="logo" />
</a>
{this.props.showCloseSidePanelIcon &&
<a

8
frontend/src/pages/org-admin/web-settings/web-settings.js
View File

@@ -19,7 +19,7 @@ class OrgWebSettings extends Component {
loading: true,
errorMsg: '',
config_dict: null,
logoPath: mediaUrl + logoPath,
logoPath: logoPath,
file_ext_white_list: '',
};
}
@@ -54,7 +54,7 @@ class OrgWebSettings extends Component {
updateLogo = (file) => {
seafileAPI.orgAdminUpdateLogo(orgID, file).then((res) => {
this.setState({
logoPath: mediaUrl + res.data.logo_path
logoPath: res.data.logo_path
});
toaster.success(gettext('Success'));
}).catch((error) => {
@@ -76,7 +76,9 @@ class OrgWebSettings extends Component {
};
render() {
const { loading, errorMsg, config_dict, logoPath, file_ext_white_list } = this.state;
const { loading, errorMsg, config_dict, file_ext_white_list } = this.state;
let logoPath = this.state.logoPath;
logoPath = logoPath.indexOf('image-view') != -1 ? logoPath : mediaUrl + logoPath;
return (
<Fragment>
<MainPanelTopbar {...this.props} />