haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-16 07:08:55 +00:00
Code Issues Releases Wiki Activity

fix groupID

Browse Source
This commit is contained in:
Michael An
2019-04-30 18:04:41 +08:00
parent 7c1cacc9ed
commit 9d2ad20767
2 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/pages/org-admin/index.js
View File

@@ -87,11 +87,6 @@ class Org extends React.Component {
render() { render() {
let { isSidePanelClosed, currentTab, isShowAddOrgUserDialog, isShowAddOrgAdminDialog, isInviteUserDialogOpen } = this.state; let { isSidePanelClosed, currentTab, isShowAddOrgUserDialog, isShowAddOrgAdminDialog, isInviteUserDialogOpen } = this.state;
let href = window.location.href;
let newPath = 'groups/';
if (href.indexOf('org/departmentadmin/groups/') > 0) {
newPath = href.slice(href.indexOf('groups/'));
}
return ( return (
<div id="main"> <div id="main">
<SidePanel isSidePanelClosed={isSidePanelClosed} onCloseSidePanel={this.onCloseSidePanel} currentTab={currentTab} tabItemClick={this.tabItemClick} /> <SidePanel isSidePanelClosed={isSidePanelClosed} onCloseSidePanel={this.onCloseSidePanel} currentTab={currentTab} tabItemClick={this.tabItemClick} />
@@ -126,7 +121,7 @@ class Org extends React.Component {
toggleAddDepartDialog={this.toggleAddDepartDialog} toggleAddDepartDialog={this.toggleAddDepartDialog}
/> />
<OrgDepartmentItem <OrgDepartmentItem
path={newPath} path='groups/:groupID'
isShowAddDepartDialog={this.state.isShowAddDepartDialog} isShowAddDepartDialog={this.state.isShowAddDepartDialog}
toggleAddDepartDialog={this.toggleAddDepartDialog} toggleAddDepartDialog={this.toggleAddDepartDialog}
isShowAddMemberDialog={this.state.isShowAddMemberDialog} isShowAddMemberDialog={this.state.isShowAddMemberDialog}

32
frontend/src/pages/org-admin/org-department-item.js
View File

@@ -26,7 +26,6 @@ class OrgDepartmentItem extends React.Component {
showDeleteMemberDialog: false, showDeleteMemberDialog: false,
showDeleteRepoDialog: false, showDeleteRepoDialog: false,
isItemFreezed: false, isItemFreezed: false,
groupID: null,
groupName: '', groupName: '',
}; };
} }
@@ -66,11 +65,11 @@ class OrgDepartmentItem extends React.Component {
} }
onRepoChanged = () => { onRepoChanged = () => {
this.listOrgGroupRepo(this.state.groupID); this.listOrgGroupRepo(this.props.groupID);
} }
onMemberChanged = () => { onMemberChanged = () => {
this.listOrgMembers(this.state.groupID); this.listOrgMembers(this.props.groupID);
} }
toggleItemFreezed = (isFreezed) => { toggleItemFreezed = (isFreezed) => {
@@ -80,26 +79,21 @@ class OrgDepartmentItem extends React.Component {
} }
componentWillMount() { componentWillMount() {
const href = window.location.href; const groupID = this.props.groupID;
let path = href.slice(href.indexOf('groups/'));
let groupID = path.slice(7, path.length - 1);
this.setState({
groupID: groupID
});
this.listOrgGroupRepo(groupID); this.listOrgGroupRepo(groupID);
this.listOrgMembers(groupID); this.listOrgMembers(groupID);
} }
render() { render() {
const members = this.state.members; const { members, repos } = this.state;
const repos = this.state.repos; const groupID = this.props.groupID;
return ( return (
<div className="main-panel-center flex-row h-100"> <div className="main-panel-center flex-row h-100">
<div className="cur-view-container o-auto"> <div className="cur-view-container o-auto">
<div className="cur-view-path"> <div className="cur-view-path">
<div className="fleft"> <div className="fleft">
<h3 className="sf-heading"> <h3 className="sf-heading">
{this.state.groupID ? {groupID ?
<a href={serviceURL + '/org/departmentadmin/'}>{gettext('Departments')}</a> <a href={serviceURL + '/org/departmentadmin/'}>{gettext('Departments')}</a>
: <span>{gettext('Departments')}</span> : <span>{gettext('Departments')}</span>
} }
@@ -109,14 +103,14 @@ class OrgDepartmentItem extends React.Component {
<span key={ancestor.id}>{' / '}<a href={newHref}>{ancestor.name}</a></span> <span key={ancestor.id}>{' / '}<a href={newHref}>{ancestor.name}</a></span>
); );
})} })}
{this.state.groupID && <span>{' / '}{this.state.groupName}</span>} {groupID && <span>{' / '}{this.state.groupName}</span>}
</h3> </h3>
</div> </div>
</div> </div>
<div className="cur-view-subcontainer org-groups"> <div className="cur-view-subcontainer org-groups">
<OrgDepartmentsList <OrgDepartmentsList
groupID={this.state.groupID} groupID={groupID}
isShowAddDepartDialog={this.props.isShowAddDepartDialog} isShowAddDepartDialog={this.props.isShowAddDepartDialog}
toggleAddDepartDialog={this.props.toggleAddDepartDialog} toggleAddDepartDialog={this.props.toggleAddDepartDialog}
/> />
@@ -150,7 +144,7 @@ class OrgDepartmentItem extends React.Component {
isItemFreezed={this.state.isItemFreezed} isItemFreezed={this.state.isItemFreezed}
onMemberChanged={this.onMemberChanged} onMemberChanged={this.onMemberChanged}
toggleItemFreezed={this.toggleItemFreezed} toggleItemFreezed={this.toggleItemFreezed}
groupID={this.state.groupID} groupID={groupID}
/> />
</React.Fragment> </React.Fragment>
); );
@@ -199,7 +193,7 @@ class OrgDepartmentItem extends React.Component {
toggle={this.toggleCancel} toggle={this.toggleCancel}
onMemberChanged={this.onMemberChanged} onMemberChanged={this.onMemberChanged}
member={this.state.deletedMember} member={this.state.deletedMember}
groupID={this.state.groupID} groupID={groupID}
/> />
</ModalPortal> </ModalPortal>
)} )}
@@ -209,7 +203,7 @@ class OrgDepartmentItem extends React.Component {
toggle={this.toggleCancel} toggle={this.toggleCancel}
onRepoChanged={this.onRepoChanged} onRepoChanged={this.onRepoChanged}
repo={this.state.deletedRepo} repo={this.state.deletedRepo}
groupID={this.state.groupID} groupID={groupID}
/> />
</ModalPortal> </ModalPortal>
)} )}
@@ -218,7 +212,7 @@ class OrgDepartmentItem extends React.Component {
<AddMemberDialog <AddMemberDialog
toggle={this.props.toggleAddMemberDialog} toggle={this.props.toggleAddMemberDialog}
onMemberChanged={this.onMemberChanged} onMemberChanged={this.onMemberChanged}
groupID={this.state.groupID} groupID={groupID}
/> />
</ModalPortal> </ModalPortal>
)} )}
@@ -227,7 +221,7 @@ class OrgDepartmentItem extends React.Component {
<AddRepoDialog <AddRepoDialog
toggle={this.props.toggleAddRepoDialog} toggle={this.props.toggleAddRepoDialog}
onRepoChanged={this.onRepoChanged} onRepoChanged={this.onRepoChanged}
groupID={this.state.groupID} groupID={groupID}
/> />
</ModalPortal> </ModalPortal>
)} )}