New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: create data source user #1167

Merged

nannan00 merged 13 commits into TencentBlueKing:ft_tenant from Canway-shiisa:ft_tenant_create_ds_user

Aug 25, 2023

Contributor

Canway-shiisa commented Aug 16, 2023

相关issue：#1154

Canway-shiisa added 2 commits

August 16, 2023 14:52


          feat: create data_source user TencentBlueKing#1154

053cbbc


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

5b98c35

…into ft_tenant_create_ds_user

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch from 63fd5ec to 5b98c35 Compare

August 16, 2023 08:20

Canway-shiisa added 2 commits

August 17, 2023 16:58


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

ece3527

…into ft_tenant_create_ds_user


          feat: create data_source user TencentBlueKing#1154

542c53d

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch from 387f4c2 to 542c53d Compare

August 17, 2023 09:38

Canway-shiisa requested a review from nannan00

August 17, 2023 09:41

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/urls.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

narasux changed the title ~~Ft tenant create ds user~~ feat: create data source user

narasux reviewed

View reviewed changes

src/bk-user/bkuser/common/error_codes.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/validators.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/validators.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/views.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/views.py Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/views.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/views.py Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/views.py Show resolved Hide resolved

narasux mentioned this pull request

feat: list data source users #1159 #1170

Merged

nannan00 reviewed

View reviewed changes

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/apis/web/data_source/serializers.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/apis/web/data_source/views.py Show resolved Hide resolved

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/biz/validators.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/biz/validators.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/biz/data_source_organization.py Show resolved Hide resolved

Canway-shiisa added 2 commits

August 19, 2023 16:25


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

8d167b8

…into ft_tenant_create_ds_user


          feat: create data_source user TencentBlueKing#1154

e2b154c

narasux reviewed

View reviewed changes

src/bk-user/bkuser/apps/data_source/models.py Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/bkuser/biz/validators.py Outdated Show resolved Hide resolved

narasux reviewed

View reviewed changes

src/bk-user/pyproject.toml Outdated Show resolved Hide resolved


          feat: create data_source user TencentBlueKing#1154

261ef73

nannan00 reviewed

View reviewed changes

src/bk-user/bkuser/apps/data_source/models.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/biz/data_source_organization.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/apps/data_source/constants.py Outdated Show resolved Hide resolved

src/bk-user/bkuser/common/validators.py Outdated Show resolved Hide resolved


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

bc38f8a

…into ft_tenant_create_ds_user

# Conflicts:
#	src/bk-user/bkuser/apis/web/urls.py

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch 8 times, most recently from f1f16f6 to 5faecc5 Compare

August 23, 2023 12:06


          feat: create data_source user TencentBlueKing#1154

c828f6b

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch from 5faecc5 to c828f6b Compare

August 23, 2023 12:07

Canway-shiisa added 3 commits

August 25, 2023 14:47


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

f6de0c4

…into ft_tenant_create_ds_user

# Conflicts:
#	src/bk-user/bkuser/apis/web/data_source/serializers.py
#	src/bk-user/bkuser/apis/web/data_source/views.py
#	src/bk-user/bkuser/common/error_codes.py
#	src/bk-user/poetry.lock
#	src/bk-user/pyproject.toml


          Merge branch 'ft_tenant' of https://github.com/Canway-shiisa/bk-user …

9d607ab

…into ft_tenant_create_ds_user


          feat: create data_source user TencentBlueKing#1154

7a68605

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch 2 times, most recently from 99e88c0 to a9e51c7 Compare

August 25, 2023 07:22


          feat: create data_source user TencentBlueKing#1154

c355502

Canway-shiisa force-pushed the ft_tenant_create_ds_user branch from a9e51c7 to c355502 Compare

August 25, 2023 07:24

nannan00 approved these changes

View reviewed changes

nannan00 merged commit 8051b90 into TencentBlueKing:ft_tenant

narasux mentioned this pull request

feat: list data source leaders and departments #1188 #1189

Merged

Canway-shiisa deleted the ft_tenant_create_ds_user branch

August 25, 2023 08:20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet