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

12.0 change old wikis return avatars (#6166)

Browse Source
This commit is contained in:
Michael An
2024-06-05 12:00:34 +08:00
committed by GitHub
parent ca83ef90dc
commit e25512a20a
2 changed files with 6 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ 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 { seafileAPI } from '../../utils/seafile-api';
import { siteRoot, gettext } from '../../utils/constants'; import { siteRoot, gettext } from '../../utils/constants';
import ModalPortal from '../modal-portal'; import ModalPortal from '../modal-portal';
import DeleteWikiDialog from '../dialog/delete-wiki-dialog'; import DeleteWikiDialog from '../dialog/delete-wiki-dialog';
@@ -23,19 +22,9 @@ class WikiCardItem extends Component {
isShowDeleteDialog: false, isShowDeleteDialog: false,
isShowRenameDialog: false, isShowRenameDialog: false,
isItemMenuShow: false, isItemMenuShow: false,
ownerAvatar: '',
}; };
} }
componentDidMount() {
const { wiki, isDepartment } = this.props;
if (!isDepartment) {
seafileAPI.getUserAvatar(wiki.owner, 24).then(res => {
this.setState({ ownerAvatar: res.data.url });
});
}
}
onRenameToggle = (e) => { onRenameToggle = (e) => {
this.setState({ this.setState({
isShowRenameDialog: !this.state.isShowRenameDialog, isShowRenameDialog: !this.state.isShowRenameDialog,
@@ -84,11 +73,11 @@ class WikiCardItem extends Component {
}; };
renderAvatar = () => { renderAvatar = () => {
const { wiki } = this.props; const { owner_nickname, owner_avatar_url } = this.props.wiki;
return ( return (
<div className="wiki-card-item-avatar-container"> <div className="wiki-card-item-avatar-container">
<img className="wiki-card-item-avatar" src={this.state.ownerAvatar} alt={wiki.owner_nickname}/> <img className="wiki-card-item-avatar" src={owner_avatar_url} alt={owner_nickname}/>
<span className="wiki-card-item-owner text-truncate" title={wiki.owner_nickname}>{wiki.owner_nickname}</span> <span className="wiki-card-item-owner text-truncate" title={owner_nickname}>{owner_nickname}</span>
</div> </div>
); );
}; };

3
seahub/wiki/models.py
View File

@@ -7,6 +7,7 @@ from seaserv import seafile_api
from seahub.base.fields import LowerCaseCharField from seahub.base.fields import LowerCaseCharField
from seahub.base.templatetags.seahub_tags import email2nickname from seahub.base.templatetags.seahub_tags import email2nickname
from seahub.avatar.templatetags.avatar_tags import api_avatar_url
from seahub.utils import get_site_scheme_and_netloc from seahub.utils import get_site_scheme_and_netloc
from seahub.utils.timeutils import (timestamp_to_isoformat_timestr, from seahub.utils.timeutils import (timestamp_to_isoformat_timestr,
datetime_to_isoformat_timestr) datetime_to_isoformat_timestr)
@@ -98,10 +99,12 @@ class Wiki(models.Model):
return True return True
def to_dict(self): def to_dict(self):
avatar_url, is_default, date_uploaded = api_avatar_url(self.username, int(32))
return { return {
'id': self.pk, 'id': self.pk,
'owner': self.username, 'owner': self.username,
'owner_nickname': email2nickname(self.username), 'owner_nickname': email2nickname(self.username),
'owner_avatar_url': avatar_url,
'name': self.name, 'name': self.name,
'slug': self.slug, 'slug': self.slug,
'link': self.link, 'link': self.link,