Skip to content
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.

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

feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除… #962

Merged

Conversation

neronkl
Copy link
Contributor

@neronkl neronkl commented Apr 14, 2023

…,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

BREAKING CHANGE: 原category.delete()将对应的资源disable且删除定时任务。新delete不会操作其资源,定期任务disable无效化,进行硬删除才将定时任务删除

feat #901

…,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

BREAKING CHANGE: 原category.delete()将对应的资源disable且删除定时任务。新delete不会操作其资源,定期任务disable无效化,进行硬删除才将定时任务删除

feat TencentBlueKing#901
src/api/bkuser_core/api/web/category/views.py Show resolved Hide resolved
src/api/bkuser_core/categories/models.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/serializers.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/login/views.py Show resolved Hide resolved
src/api/bkuser_core/categories/plugins/utils.py Outdated Show resolved Hide resolved
@neronkl neronkl requested a review from Canway-shiisa April 21, 2023 08:49
@neronkl neronkl force-pushed the delete_category branch 2 times, most recently from 67e37fa to 5599816 Compare April 25, 2023 06:23
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/recycle_bin/tasks.py Outdated Show resolved Hide resolved
src/api/bkuser_core/recycle_bin/tasks.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/category/serializers.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/category/serializers.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/category/views.py Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/serializers.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/serializers.py Outdated Show resolved Hide resolved
src/api/bkuser_core/api/web/recycle_bin/views.py Outdated Show resolved Hide resolved
src/api/bkuser_core/audit/handlers.py Show resolved Hide resolved
src/api/bkuser_core/categories/models.py Show resolved Hide resolved
src/api/bkuser_core/categories/signals.py Outdated Show resolved Hide resolved
src/api/bkuser_core/categories/plugins/utils.py Outdated Show resolved Hide resolved
@neronkl neronkl force-pushed the delete_category branch 2 times, most recently from de5f226 to ab9de24 Compare May 4, 2023 12:44
@neronkl neronkl requested a review from Canway-shiisa May 4, 2023 12:50
@neronkl neronkl force-pushed the delete_category branch 2 times, most recently from 1da72c4 to ef97ea6 Compare May 5, 2023 02:58
@Canway-shiisa Canway-shiisa requested a review from nannan00 May 5, 2023 06:01
@neronkl neronkl force-pushed the delete_category branch from ef97ea6 to a9ac6fe Compare May 9, 2023 08:49
@neronkl neronkl force-pushed the delete_category branch 3 times, most recently from f29492a to b81e569 Compare May 10, 2023 09:08
@neronkl neronkl requested a review from nannan00 May 10, 2023 09:16
@neronkl neronkl force-pushed the delete_category branch from b81e569 to 85ddce1 Compare May 11, 2023 09:17
@Canway-shiisa Canway-shiisa added this to the Y2023M20 milestone May 15, 2023
@neronkl neronkl force-pushed the delete_category branch from 85ddce1 to 93856d2 Compare May 15, 2023 06:11
@neronkl neronkl force-pushed the delete_category branch 7 times, most recently from 3346187 to a937bbf Compare May 18, 2023 08:17
@neronkl neronkl requested a review from Canway-shiisa May 18, 2023 08:42
@Canway-shiisa Canway-shiisa modified the milestones: Y2023M20, Y2023M21 May 22, 2023
cr调整,单元测试补充以及调整
@neronkl neronkl force-pushed the delete_category branch from a937bbf to 1fc4646 Compare May 23, 2023 13:09
@nannan00 nannan00 modified the milestones: Y2023M21, Y2023M22, Y2023M23 May 29, 2023
@nannan00 nannan00 modified the milestones: Y2023M23, Y2023M24, Y2023M25 Jun 12, 2023
@nannan00 nannan00 modified the milestones: Y2023M25, Y2023M26 Jun 26, 2023
@nannan00 nannan00 merged commit 5fe7bac into TencentBlueKing:ft_merge_nav_tree_category Jun 27, 2023
yuri0528 pushed a commit to yuri0528/bk-user that referenced this pull request Jun 27, 2023
TencentBlueKing#962)

* feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

feat TencentBlueKing#901 TencentBlueKing#960
yuri0528 pushed a commit to yuri0528/bk-user that referenced this pull request Jun 27, 2023
TencentBlueKing#962)

* feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除,还原功能

回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;

feat TencentBlueKing#901 TencentBlueKing#960
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants