haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 10:50:24 +00:00
Code Issues Releases Wiki Activity

fix create wiki select department (#6803)

Browse Source
This commit is contained in:
Michael An
2024-09-20 16:04:35 +08:00
committed by GitHub
parent 9c25c1c661
commit e62d59fc55
3 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/dialog/add-wiki-dialog.js
View File

@@ -10,7 +10,7 @@ import { SeahubSelect } from '../common/select';
const propTypes = {
toggleCancel: PropTypes.func.isRequired,
addWiki: PropTypes.func.isRequired,
currentDeptEmail: PropTypes.string,
currentDeptID: PropTypes.string,
};
class AddWikiDialog extends React.Component {
@@ -41,8 +41,8 @@ class AddWikiDialog extends React.Component {
options.push(obj);
}
this.setState({ options });
if (this.props.currentDeptEmail) {
const selectedOption = options.find(op => op.email == this.props.currentDeptEmail);
if (this.props.currentDeptID) {
const selectedOption = options.find(op => op.id == this.props.currentDeptID);
this.setState({ selectedOption });
}
}).catch(error => {

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

@@ -105,24 +105,26 @@ class WikiCardView extends Component {
toggelAddWikiDialog={null}
/>
);
for (let deptID in groupWikis) {
groupWikis[deptID].wiki_info.length !== 0 &&
wikiCardGroups.push(
<WikiCardGroup
key={'group-Wikis-' + deptID}
deleteWiki={this.props.deleteWiki}
unshareGroupWiki={this.props.unshareGroupWiki}
renameWiki={this.props.renameWiki}
sidePanelRate={sidePanelRate}
isSidePanelFolded={isSidePanelFolded}
group={groupWikis[deptID]}
wikis={groupWikis[deptID].wiki_info}
title={groupWikis[deptID].group_name}
isDepartment={true}
isShowAvatar={false}
toggelAddWikiDialog={(canPublishRepo && this.state.departmentMap[groupWikis[deptID]['group_id']]) ? toggelAddWikiDialog.bind(this, deptID) : null}
/>
);
for (let i = 0; i < groupWikis.length; i++) {
const groupWiki = groupWikis[i];
if (groupWiki.wiki_info.length !== 0) {
wikiCardGroups.push(
<WikiCardGroup
key={'group-Wikis-' + groupWiki.group_id}
deleteWiki={this.props.deleteWiki}
unshareGroupWiki={this.props.unshareGroupWiki}
renameWiki={this.props.renameWiki}
sidePanelRate={sidePanelRate}
isSidePanelFolded={isSidePanelFolded}
group={groupWiki}
wikis={groupWiki.wiki_info}
title={groupWiki.group_name}
isDepartment={true}
isShowAvatar={false}
toggelAddWikiDialog={(canPublishRepo && this.state.departmentMap[groupWiki.group_id]) ? toggelAddWikiDialog.bind(this, groupWiki.group_id) : null}
/>
);
}
}
wikiCardGroups.push(
<WikiCardGroup