update repo trash #6148
Merged
update repo trash #6148
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
awu0403
force-pushed
the
update-repo-trash
branch
4 times, most recently
from
aa7e311
to
8b660c3
Compare
r350178982
force-pushed
the
update-repo-trash
branch
from
7a7a9c4
to
6df93c8
Compare
awu0403
force-pushed
the
update-repo-trash
branch
3 times, most recently
from
554ddbd
to
8346741
Compare
r350178982
force-pushed
the
update-repo-trash
branch
from
eff201a
to
5987b11
Compare
awu0403
force-pushed
the
update-repo-trash
branch
from
0d082e6
to
d63ac28
Compare
awu0403
force-pushed
the
update-repo-trash
branch
from
a06e5b4
to
b94ef7a
Compare
awu0403
force-pushed
the
update-repo-trash
branch
from
b94ef7a
to
86cbf7b
Compare
r350178982
reviewed
Jul 15, 2024
seahub/api2/endpoints/dir.py
Outdated
| @@ -561,7 +562,9 @@ def delete(self, request, repo_id, format=None): | |||
| username = request.user.username | |||
| parent_dir = os.path.dirname(path) | |||
| dir_name = os.path.basename(path) | |||
|
|
|||
r350178982
reviewed
Jul 15, 2024
seahub/api2/endpoints/file.py
Outdated
| @@ -5,6 +5,7 @@ | |||
| import logging | |||
| import posixpath | |||
| import requests | |||
| import datetime | |||
r350178982
reviewed
Jul 15, 2024
seahub/api2/views.py
Outdated
| @@ -144,6 +144,7 @@ | |||
|
|
|||
| from constance import config | |||
|
|
|||
|
|
|||
| logger = logging.getLogger(__name__) | |||
r350178982
reviewed
Jul 15, 2024
| @@ -1095,6 +1095,7 @@ def react_fake_view(request, **kwargs): | |||
| 'upload_link_expire_days_max': UPLOAD_LINK_EXPIRE_DAYS_MAX, | |||
| 'enable_encrypted_library': config.ENABLE_ENCRYPTED_LIBRARY, | |||
| 'enable_repo_history_setting': config.ENABLE_REPO_HISTORY_SETTING, | |||
| 'enable_clean': config.ENABLE_USER_CLEAN_TRASH, | |||
| 'enable_reset_encrypted_repo_password': ENABLE_RESET_ENCRYPTED_REPO_PASSWORD, | |||
There was a problem hiding this comment.
enable_clean --> enable_user_clean_trash
r350178982
reviewed
Jul 15, 2024
| @@ -109,6 +109,7 @@ | |||
| canPublishRepo: {% if user.permissions.can_publish_repo %} true {% else %} false {% endif %}, | |||
| enableEncryptedLibrary: {% if enable_encrypted_library %} true {% else %} false {% endif %}, | |||
| enableRepoHistorySetting: {% if enable_repo_history_setting %} true {% else %} false {% endif %}, | |||
| enableClean: {% if enable_clean %} true {% else %} false {% endif %}, | |||
| isSystemStaff: {% if request.user.is_staff %} true {% else %} false {% endif %}, | |||
There was a problem hiding this comment.
enableClean-->enableUserCleanTrash
r350178982
reviewed
Jul 15, 2024
r350178982
reviewed
Jul 15, 2024
sql/mysql.sql
Outdated
| `size` bigint(20) NOT NULL, | ||
| PRIMARY KEY (`id`), | ||
| KEY `ix_FileTrash_repo_id` (`repo_id`) | ||
| ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3; |
There was a problem hiding this comment.
CHARSET=utf8mb4 COLLATE=utf8_general_ci;
r350178982
reviewed
Jul 15, 2024
seahub/api2/endpoints/repo_trash.py
Outdated
|
|
||
| # argument check | ||
| path = request.data.get('path', '/') | ||
|
|
There was a problem hiding this comment.
这个请求参数不需要了， 直接写 path = '/' 就可以了
r350178982
reviewed
Jul 15, 2024
| for item in deleted_entries: | ||
| item_info = self.get_item_info(item) | ||
| items.append(item_info) | ||
|
|
There was a problem hiding this comment.
在seafevents层面直接排序后返回， 不需要直接在这里进行排序
r350178982
reviewed
Jul 17, 2024
seahub/api2/endpoints/repo_trash.py
Outdated
| current_page = int(request.GET.get('page', '1')) | ||
| per_page = int(request.GET.get('per_page', '100')) | ||
| if per_page > 100: | ||
| per_page = 100 |
There was a problem hiding this comment.
大于100这个判断不用加， 这里只是默认返回100条目， 具体请求多少条目不需要判断
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.
No description provided.