haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5731 from haiwen/feat-sdoc-comment-avatar-size

Browse Source 
feat: sdoc comment avatar size use default
This commit is contained in:
杨顺强
2023-11-04 15:28:50 +08:00
committed by GitHub
parent db11007b07 33c43ca8d8
commit c5a75c75ca
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
seahub/seadoc/apis.py
View File

@@ -49,6 +49,7 @@ from seahub.constants import PERMISSION_READ_WRITE, PERMISSION_INVISIBLE
from seahub.seadoc.sdoc_server_api import SdocServerAPI from seahub.seadoc.sdoc_server_api import SdocServerAPI
from seahub.file_participants.models import FileParticipant from seahub.file_participants.models import FileParticipant
from seahub.base.accounts import User from seahub.base.accounts import User
from seahub.avatar.settings import AVATAR_DEFAULT_SIZE
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -562,11 +563,11 @@ class SeadocHistory(APIView):
commit_id = repo.head_cmmt_id commit_id = repo.head_cmmt_id
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
page = int(request.GET.get('page', 1)) page = int(request.GET.get('page', 1))
per_page = int(request.GET.get('per_page', 25)) per_page = int(request.GET.get('per_page', 25))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
page = 1 page = 1
per_page = 25 per_page = 25
@@ -804,9 +805,9 @@ class SeadocCommentsView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
resolved = request.GET.get('resolved', None) resolved = request.GET.get('resolved', None)
if resolved not in ('true', 'false', None): if resolved not in ('true', 'false', None):
@@ -856,9 +857,9 @@ class SeadocCommentsView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
comment = request.data.get('comment', '') comment = request.data.get('comment', '')
detail = request.data.get('detail', '') detail = request.data.get('detail', '')
@@ -889,9 +890,9 @@ class SeadocCommentView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
# resource check # resource check
try: try:
@@ -935,9 +936,9 @@ class SeadocCommentView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
# argument check # argument check
resolved = request.data.get('resolved') resolved = request.data.get('resolved')
@@ -989,9 +990,9 @@ class SeadocCommentRepliesView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
start = None start = None
end = None end = None
page = request.GET.get('page', '') page = request.GET.get('page', '')
@@ -1034,9 +1035,9 @@ class SeadocCommentRepliesView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
reply_content = request.data.get('reply', '') reply_content = request.data.get('reply', '')
type_content = request.data.get('type', 'reply') type_content = request.data.get('type', 'reply')
author = request.data.get('author', '') author = request.data.get('author', '')
@@ -1078,9 +1079,9 @@ class SeadocCommentReplyView(APIView):
return api_error(status.HTTP_403_FORBIDDEN, error_msg) return api_error(status.HTTP_403_FORBIDDEN, error_msg)
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
# resource check # resource check
file_comment = FileComment.objects.filter( file_comment = FileComment.objects.filter(
@@ -1132,9 +1133,9 @@ class SeadocCommentReplyView(APIView):
if reply_content is None: if reply_content is None:
return api_error(status.HTTP_400_BAD_REQUEST, 'reply invalid.') return api_error(status.HTTP_400_BAD_REQUEST, 'reply invalid.')
try: try:
avatar_size = int(request.GET.get('avatar_size', 32)) avatar_size = int(request.GET.get('avatar_size', AVATAR_DEFAULT_SIZE))
except ValueError: except ValueError:
avatar_size = 32 avatar_size = AVATAR_DEFAULT_SIZE
# resource check # resource check
file_comment = FileComment.objects.filter( file_comment = FileComment.objects.filter(