Group link invitation #6055
Closed
Group link invitation #6055
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
awu0403
changed the title
r350178982
reviewed
May 9, 2024
| @@ -344,6 +344,9 @@ | |||
| re_path(r'^api/v2.1/groups/(?P<group_id>\d+)/members/(?P<email>[^/]+)/$', GroupMember.as_view(), name='api-v2.1-group-member'), | |||
| re_path(r'^api/v2.1/search-group/$', SearchGroup.as_view(), name='api-v2.1-search-group'), | |||
|
|
|||
| re_path(r'^api/v2.1/groups/(?P<group_id>\d+)/invite-links/$', GroupInviteLinks.as_view(),name='api-v2.1-group-invite-links'), | |||
| re_path(r'^api/v2.1/groups/(?P<group_id>\d+)/invite-links/(?P<token>[-0-9a-f]{8})/$', GroupInviteLink.as_view(), name='api-v2.1-group-invite-link'), | |||
| re_path(r'^group-invite/(?P<token>[-0-9a-f]{8})/$', group_invite, name='group_invite'), | |||
| ## address book | |||
There was a problem hiding this comment.
group-invite 这个不要写在 api/v2.1/...的区域， 同时 group_invite view也不要写在 api 的endpoints里面， 放在group/view.py 文件里面
r350178982
reviewed
May 9, 2024
| group = ccnet_api.get_group(group_id) | ||
| if MULTI_TENANCY: | ||
| error_msg = ' Multiple tenancy is not supported.' | ||
| return api_error(status.HTTP_400_BAD_REQUEST, error_msg) |
There was a problem hiding this comment.
error_msg = ' Feature disabled.' 上面都是如此。
同时需要判断该group是群组还是部门
r350178982
reviewed
May 9, 2024
| return api_error(status.HTTP_404_NOT_FOUND, error_msg) | ||
|
|
||
| if not is_group_owner_or_admin(group, email): | ||
| error_msg = 'Permission denied.' |
There was a problem hiding this comment.
已经有一个函数叫is_group_admin_or_owner可以使用， 不用重新定义该函数了
r350178982
reviewed
May 9, 2024
seahub/profile/models.py
Outdated
|
|
||
| cache.set(key, nickname, NICKNAME_CACHE_TIMEOUT) | ||
| return nickname | ||
|
|
r350178982
reviewed
May 9, 2024
| @@ -472,6 +482,7 @@ class GroupView extends React.Component { | |||
| <ul className="sf-popover-list"> | |||
| <li><a href="#" className="sf-popover-item" onClick={this.toggleImportMembersDialog} >{gettext('Import Members')}</a></li> | |||
| <li><a href="#" className="sf-popover-item" onClick={this.toggleManageMembersDialog} >{gettext('Manage Members')}</a></li> | |||
| <li><a href="#" className="sf-popover-item" onClick={this.toggleInviteMembersDialog} >{gettext('Invite Members')}</a></li> | |||
| </ul> | |||
There was a problem hiding this comment.
这里需要判断是否是多租户，以及是否是部门，来进行显示
awu0403
force-pushed
the
link-invite-to-join-group
branch
from
eb9c726
to
67b96c8
Compare
r350178982
reviewed
May 9, 2024
| if group.creator_name == "system admin": | ||
| error_msg = ' Feature disabled.' | ||
| return api_error(status.HTTP_400_BAD_REQUEST, error_msg) | ||
|
|
There was a problem hiding this comment.
Forbidden to operate department group
awu0403
force-pushed
the
link-invite-to-join-group
branch
from
67b96c8
to
f55ebfb
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.