mirror of
https://github.com/haiwen/seahub.git
synced 2025-09-20 02:48:51 +00:00
Merge branch 'upload'
This commit is contained in:
@@ -164,6 +164,7 @@ AVATAR_CACHE_TIMEOUT = 0
|
|||||||
# Info-bar notification cache
|
# Info-bar notification cache
|
||||||
NOTIFICATION_CACHE_TIMEOUT = 0
|
NOTIFICATION_CACHE_TIMEOUT = 0
|
||||||
|
|
||||||
|
USER_TOTAL_SPACE = 2 * pow(2,30)
|
||||||
|
|
||||||
# File upload
|
# File upload
|
||||||
FILE_UPLOAD_MAX_MEMORY_SIZE = 0
|
FILE_UPLOAD_MAX_MEMORY_SIZE = 0
|
||||||
|
2
views.py
2
views.py
@@ -275,7 +275,7 @@ def render_repo(request, repo_id, error=''):
|
|||||||
@login_required
|
@login_required
|
||||||
def repo_upload_file(request, repo_id):
|
def repo_upload_file(request, repo_id):
|
||||||
repo = get_repo(repo_id)
|
repo = get_repo(repo_id)
|
||||||
total_space = pow(2,30)
|
total_space = settings.USER_TOTAL_SPACE
|
||||||
used_space = seafserv_threaded_rpc.get_user_quota_usage(request.user.username)
|
used_space = seafserv_threaded_rpc.get_user_quota_usage(request.user.username)
|
||||||
############ GET ############
|
############ GET ############
|
||||||
if request.method == 'GET':
|
if request.method == 'GET':
|
||||||
|
Reference in New Issue
Block a user