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

rm outer_parent_id

Browse Source
This commit is contained in:
skywalker 2021-04-08 12:00:15 +08:00
parent 04515c829e
commit 14ce83c518
7 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
seahub/api2/endpoints/admin/dingtalk.py
View File

@ -361,7 +361,6 @@ class AdminDingtalkDepartmentsImport(APIView):
group_id=group_id, group_id=group_id,
provider=DINGTALK_PROVIDER, provider=DINGTALK_PROVIDER,
outer_id=department_obj_id, outer_id=department_obj_id,
outer_parent_id=parent_department_id,
) )
department_map_to_group_dict[department_obj_id] = group_id department_map_to_group_dict[department_obj_id] = group_id

1
seahub/api2/endpoints/admin/work_weixin.py
View File

@ -391,7 +391,6 @@ class AdminWorkWeixinDepartmentsImport(APIView):
group_id=group_id, group_id=group_id,
provider=WORK_WEIXIN_PROVIDER, provider=WORK_WEIXIN_PROVIDER,
outer_id=department_obj_id, outer_id=department_obj_id,
outer_parent_id=parent_department_id,
) )
department_map_to_group_dict[department_obj_id] = group_id department_map_to_group_dict[department_obj_id] = group_id

1
seahub/auth/models.py
View File

@ -174,7 +174,6 @@ class ExternalDepartment(models.Model):
group_id = models.IntegerField(unique=True) group_id = models.IntegerField(unique=True)
provider = models.CharField(max_length=32) provider = models.CharField(max_length=32)
outer_id = models.BigIntegerField() outer_id = models.BigIntegerField()
outer_parent_id = models.BigIntegerField()
objects = ExternalDepartmentManager() objects = ExternalDepartmentManager()

2
seahub/dingtalk/management/commands/fix_dingtalk_departments_sync.py
View File

@ -98,7 +98,6 @@ class Command(BaseCommand):
# check department argument # check department argument
group_name = department_obj.get('name') group_name = department_obj.get('name')
department_obj_id = department_obj.get('id') department_obj_id = department_obj.get('id')
parent_department_id = department_obj.get('parentid', 0)
if department_obj_id is None or not group_name: if department_obj_id is None or not group_name:
continue continue
@ -116,7 +115,6 @@ class Command(BaseCommand):
group_id=group.id, group_id=group.id,
provider=DINGTALK_PROVIDER, provider=DINGTALK_PROVIDER,
outer_id=department_obj_id, outer_id=department_obj_id,
outer_parent_id=parent_department_id,
) )
count += 1 count += 1

2
seahub/work_weixin/management/commands/fix_work_weixin_departments_sync.py
View File

@ -97,7 +97,6 @@ class Command(BaseCommand):
# check department argument # check department argument
group_name = department_obj.get('name') group_name = department_obj.get('name')
department_obj_id = department_obj.get('id') department_obj_id = department_obj.get('id')
parent_department_id = department_obj.get('parentid', 0)
if department_obj_id is None or not group_name: if department_obj_id is None or not group_name:
continue continue
@ -115,7 +114,6 @@ class Command(BaseCommand):
group_id=group.id, group_id=group.id,
provider=WORK_WEIXIN_PROVIDER, provider=WORK_WEIXIN_PROVIDER,
outer_id=department_obj_id, outer_id=department_obj_id,
outer_parent_id=parent_department_id,
) )
count += 1 count += 1

1
sql/mysql.sql
View File

@ -1288,7 +1288,6 @@ CREATE TABLE `external_department` (
`group_id` int(11) NOT NULL, `group_id` int(11) NOT NULL,
`provider` varchar(32) NOT NULL, `provider` varchar(32) NOT NULL,
`outer_id` bigint(20) NOT NULL, `outer_id` bigint(20) NOT NULL,
`outer_parent_id` bigint(20) NOT NULL,
PRIMARY KEY (`id`), PRIMARY KEY (`id`),
UNIQUE KEY `group_id` (`group_id`), UNIQUE KEY `group_id` (`group_id`),
UNIQUE KEY `external_department_provider_outer_id_8dns6vkw_uniq` (`provider`,`outer_id`) UNIQUE KEY `external_department_provider_outer_id_8dns6vkw_uniq` (`provider`,`outer_id`)

2
sql/sqlite3.sql
View File

@ -600,6 +600,6 @@ CREATE INDEX "ocm_share_received_from_server_url_10527b80" ON "ocm_share_receive
CREATE INDEX "ocm_share_received_repo_id_9e77a1b9" ON "ocm_share_received" ("repo_id"); CREATE INDEX "ocm_share_received_repo_id_9e77a1b9" ON "ocm_share_received" ("repo_id");
CREATE INDEX "ocm_share_received_provider_id_60c873e0" ON "ocm_share_received" ("provider_id"); CREATE INDEX "ocm_share_received_provider_id_60c873e0" ON "ocm_share_received" ("provider_id");
CREATE TABLE "repo_auto_delete" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "repo_id" varchar(36) NOT NULL UNIQUE, "days" integer NOT NULL); CREATE TABLE "repo_auto_delete" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "repo_id" varchar(36) NOT NULL UNIQUE, "days" integer NOT NULL);
CREATE TABLE "external_department" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "group_id" integer NOT NULL UNIQUE, "provider" varchar(32) NOT NULL, "outer_id" bigint NOT NULL, "outer_parent_id" bigint NOT NULL); CREATE TABLE "external_department" ("id" integer NOT NULL PRIMARY KEY AUTOINCREMENT, "group_id" integer NOT NULL UNIQUE, "provider" varchar(32) NOT NULL, "outer_id" bigint NOT NULL);
CREATE UNIQUE INDEX "external_department_provider_outer_id_8dns6vkw_uniq" ON "external_department" (`provider`,`outer_id`); CREATE UNIQUE INDEX "external_department_provider_outer_id_8dns6vkw_uniq" ON "external_department" (`provider`,`outer_id`);
COMMIT; COMMIT;