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

fix create department wiki bug (#6863)

Browse Source
This commit is contained in:
Michael An
2024-09-29 17:54:16 +08:00
committed by GitHub
parent ac9ea564b8
commit 2a4949f518
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/pages/wikis/wikis.js
View File

@@ -104,6 +104,7 @@ class Wikis extends Component {
let groupWikis = this.state.groupWikis; let groupWikis = this.state.groupWikis;
let new_wiki = res.data; let new_wiki = res.data;
new_wiki['version'] = 'v2'; new_wiki['version'] = 'v2';
new_wiki['admins'] = new_wiki.group_admins;
if (currentDeptID) { if (currentDeptID) {
groupWikis.filter(group => { groupWikis.filter(group => {
if (group.group_id === currentDeptID) { if (group.group_id === currentDeptID) {

8
seahub/api2/endpoints/wiki2.py
View File

@@ -268,7 +268,15 @@ class Wikis2View(APIView):
wiki_info['owner_nickname'] = email2nickname(wiki.owner) wiki_info['owner_nickname'] = email2nickname(wiki.owner)
else: else:
group_id = int(wiki.owner.split('@')[0]) group_id = int(wiki.owner.split('@')[0])
try:
ccnet_db = CcnetDB()
group_ids_admins_map = ccnet_db.get_group_ids_admins_map([group_id])
except Exception as e:
logger.error(e)
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
wiki_info['owner_nickname'] = group_id_to_name(group_id) wiki_info['owner_nickname'] = group_id_to_name(group_id)
wiki_info['group_admins'] = group_ids_admins_map[group_id]
return Response(wiki_info) return Response(wiki_info)