-
Notifications
You must be signed in to change notification settings - Fork 66
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
nannan00
merged 6 commits into
TencentBlueKing:ft_merge_nav_tree_category
from
neronkl:delete_category
Jun 27, 2023
Merged
feat(recycle_bin, categories, audit, period_task, login): 回收站目录项:新增删除… #962
nannan00
merged 6 commits into
TencentBlueKing:ft_merge_nav_tree_category
from
neronkl:delete_category
Jun 27, 2023
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
neronkl
force-pushed
the
delete_category
branch
from
April 14, 2023 06:53
2815aca
to
79e6387
Compare
…,还原功能 回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录; BREAKING CHANGE: 原category.delete()将对应的资源disable且删除定时任务。新delete不会操作其资源,定期任务disable无效化,进行硬删除才将定时任务删除 feat TencentBlueKing#901
neronkl
force-pushed
the
delete_category
branch
from
April 14, 2023 07:01
79e6387
to
8a9b118
Compare
neronkl
force-pushed
the
delete_category
branch
2 times, most recently
from
April 25, 2023 06:23
67e37fa
to
5599816
Compare
neronkl
force-pushed
the
delete_category
branch
from
April 26, 2023 03:30
5599816
to
9ed8854
Compare
nannan00
reviewed
May 4, 2023
neronkl
force-pushed
the
delete_category
branch
2 times, most recently
from
May 4, 2023 12:44
de5f226
to
ab9de24
Compare
neronkl
force-pushed
the
delete_category
branch
2 times, most recently
from
May 5, 2023 02:58
1da72c4
to
ef97ea6
Compare
nannan00
reviewed
May 9, 2023
neronkl
force-pushed
the
delete_category
branch
3 times, most recently
from
May 10, 2023 09:08
f29492a
to
b81e569
Compare
neronkl
force-pushed
the
delete_category
branch
7 times, most recently
from
May 18, 2023 08:17
3346187
to
a937bbf
Compare
nannan00
reviewed
May 23, 2023
src/api/bkuser_core/categories/migrations/0015_change_disable_category_status_to_deleted.py
Outdated
Show resolved
Hide resolved
src/api/bkuser_core/categories/migrations/0015_change_disable_category_status_to_deleted.py
Show resolved
Hide resolved
cr调整,单元测试补充以及调整
refactor(recycle_bin): web api and sync task
refactor(tests): delete some unuse api
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
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.
…,还原功能
回收站内删除等同对象硬删除(相关资源一并删除),还原为对象恢复正常状态,操作计入审计日志;阻止异常状态目录用户登录;
BREAKING CHANGE: 原category.delete()将对应的资源disable且删除定时任务。新delete不会操作其资源,定期任务disable无效化,进行硬删除才将定时任务删除
feat #901