haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-15 05:33:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6144 from haiwen/fix-old-wiki-avatar

Browse Source 
Fix old wiki avatar
This commit is contained in:
Michael An 2024-05-30 17:51:39 +08:00 committed by GitHub
commit 7d775a2d2e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/components/wiki-card-view/wiki-card-group.js
View File

@ -25,6 +25,7 @@ class WikiCardGroup extends Component {
key={index} key={index}
wiki={wiki} wiki={wiki}
deleteWiki={this.props.deleteWiki} deleteWiki={this.props.deleteWiki}
isDepartment={isDepartment}
/> />
); );
})} })}

7
frontend/src/components/wiki-card-view/wiki-card-item.js
View File

@ -2,13 +2,14 @@ import React, { Component } from 'react';
import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap'; import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import moment from 'moment'; import moment from 'moment';
import { siteRoot, gettext, appAvatarURL, username } from '../../utils/constants'; import { siteRoot, gettext, appAvatarURL } from '../../utils/constants';
import ModalPortal from '../modal-portal'; import ModalPortal from '../modal-portal';
import WikiDeleteDialog from '../dialog/wiki-delete-dialog'; import WikiDeleteDialog from '../dialog/wiki-delete-dialog';
const propTypes = { const propTypes = {
wiki: PropTypes.object.isRequired, wiki: PropTypes.object.isRequired,
deleteWiki: PropTypes.func.isRequired, deleteWiki: PropTypes.func.isRequired,
isDepartment: PropTypes.bool.isRequired,
}; };
class WikiCardItem extends Component { class WikiCardItem extends Component {
@ -75,7 +76,7 @@ class WikiCardItem extends Component {
}; };
render() { render() {
const { wiki } = this.props; const { wiki, isDepartment } = this.props;
let isOldVersion = wiki.version !== 'v2'; let isOldVersion = wiki.version !== 'v2';
let publishedUrl = `${siteRoot}published/${encodeURIComponent(wiki.slug)}/`; let publishedUrl = `${siteRoot}published/${encodeURIComponent(wiki.slug)}/`;
let editUrl = `${siteRoot}wikis/${wiki.id}/`; let editUrl = `${siteRoot}wikis/${wiki.id}/`;
@ -108,7 +109,7 @@ class WikiCardItem extends Component {
</Dropdown> </Dropdown>
</div> </div>
<div className="wiki-card-item-bottom"> <div className="wiki-card-item-bottom">
{wiki.owner === username ? this.renderAvatar() : this.renderDept()} {isDepartment ? this.renderDept() : this.renderAvatar()}
<span className="wiki-item-updated-time">{moment(wiki.updated_at).fromNow()}</span> <span className="wiki-item-updated-time">{moment(wiki.updated_at).fromNow()}</span>
</div> </div>
</div> </div>