haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-06 17:33:18 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5172 from haiwen/delete-repo-info

Browse Source 
update share info message when delete repo
This commit is contained in:
Daniel Pan
2022-04-13 21:20:48 +08:00
committed by GitHub
parent 5b152ac248 fb284467a5
commit 6a688db352
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/dialog/delete-repo-dialog.js
View File

@@ -52,9 +52,12 @@ class DeleteRepoDialog extends Component {
let message = gettext('Are you sure you want to delete %s ?'); let message = gettext('Are you sure you want to delete %s ?');
message = message.replace('%s', repoName); message = message.replace('%s', repoName);
let alert_message = gettext('This library has been shared to {user_amount} user(s) and {group_amount} group(s).'); let alert_message = '';
alert_message = alert_message.replace('{user_amount}', this.state.sharedToUserCount); if (this.state.sharedToUserCount > 0 || this.state.sharedToGroupCount > 0) {
alert_message = alert_message.replace('{group_amount}', this.state.sharedToGroupCount); alert_message = gettext('This library has been shared to {user_amount} user(s) and {group_amount} group(s).');
alert_message = alert_message.replace('{user_amount}', this.state.sharedToUserCount);
alert_message = alert_message.replace('{group_amount}', this.state.sharedToGroupCount);
}
const { toggle: toggleDialog } = this.props; const { toggle: toggleDialog } = this.props;
@@ -63,7 +66,7 @@ class DeleteRepoDialog extends Component {
<ModalHeader toggle={toggleDialog}>{gettext('Delete Library')}</ModalHeader> <ModalHeader toggle={toggleDialog}>{gettext('Delete Library')}</ModalHeader>
<ModalBody> <ModalBody>
<p dangerouslySetInnerHTML={{__html: message}}></p> <p dangerouslySetInnerHTML={{__html: message}}></p>
<p className="error" dangerouslySetInnerHTML={{__html: alert_message}}></p> { alert_message != '' && <p className="error" dangerouslySetInnerHTML={{__html: alert_message}}></p>}
</ModalBody> </ModalBody>
<ModalFooter> <ModalFooter>
<Button color="secondary" onClick={toggleDialog}>{gettext('Cancel')}</Button> <Button color="secondary" onClick={toggleDialog}>{gettext('Cancel')}</Button>

10
seahub/api2/endpoints/repos.py
View File

@@ -429,9 +429,17 @@ class RepoShareInfoView(APIView):
shared_users = seafile_api.list_repo_shared_to(repo_owner, repo_id) shared_users = seafile_api.list_repo_shared_to(repo_owner, repo_id)
shared_groups = seafile_api.list_repo_shared_group_by_user(repo_owner, repo_id) shared_groups = seafile_api.list_repo_shared_group_by_user(repo_owner, repo_id)
group_id = ''
if '@seafile_group' in repo_owner:
group_id = get_group_id_by_repo_owner(repo_owner)
shared_group_ids = [item.group_id for item in shared_groups]
if group_id and group_id in shared_group_ids:
shared_group_ids.remove(group_id)
result = { result = {
"shared_user_emails": [item.user for item in shared_users], "shared_user_emails": [item.user for item in shared_users],
"shared_group_ids": [item.group_id for item in shared_groups], "shared_group_ids": shared_group_ids,
} }
return Response(result) return Response(result)