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

unset admin after transfer success

Browse Source
This commit is contained in:
lian
2016-05-06 14:52:28 +08:00
parent 804695bbe2
commit e71ca6d84b
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
seahub/api2/endpoints/groups.py
View File

@@ -10,7 +10,7 @@ from rest_framework.views import APIView
from rest_framework import status from rest_framework import status
import seaserv import seaserv
from seaserv import seafile_api from seaserv import seafile_api, ccnet_api
from pysearpc import SearpcError from pysearpc import SearpcError
from seahub.api2.utils import api_error from seahub.api2.utils import api_error
@@ -256,12 +256,13 @@ class Group(APIView):
# transfer a group # transfer a group
if not is_group_member(group_id, new_owner): if not is_group_member(group_id, new_owner):
seaserv.ccnet_threaded_rpc.group_add_member(group_id, username, new_owner) ccnet_api.group_add_member(group_id, username, new_owner)
if not is_group_admin(group_id, new_owner): if not is_group_admin(group_id, new_owner):
seaserv.ccnet_threaded_rpc.group_set_admin(group_id, new_owner) ccnet_api.group_set_admin(group_id, new_owner)
seaserv.ccnet_threaded_rpc.set_group_creator(group_id, new_owner) ccnet_api.set_group_creator(group_id, new_owner)
ccnet_api.group_unset_admin(group_id, username)
except SearpcError as e: except SearpcError as e:
logger.error(e) logger.error(e)

3
tests/api/endpoints/test_groups.py
View File

@@ -124,7 +124,10 @@ class GroupsTest(BaseTestCase):
self.assertEqual(200, resp.status_code) self.assertEqual(200, resp.status_code)
json_resp = json.loads(resp.content) json_resp = json.loads(resp.content)
assert json_resp['owner'] == new_creator assert json_resp['owner'] == new_creator
assert new_creator in json_resp['admins']
assert self.user.email not in json_resp['admins']
def test_can_not_transfer_group_to_group_owner(self): def test_can_not_transfer_group_to_group_owner(self):
new_creator = self.user.email new_creator = self.user.email