1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 18:29:23 +00:00

Merge branch 'upload'

This commit is contained in:
xiez
2012-07-09 13:06:28 +08:00
2 changed files with 2 additions and 1 deletions

View File

@@ -164,6 +164,7 @@ AVATAR_CACHE_TIMEOUT = 0
# Info-bar notification cache
NOTIFICATION_CACHE_TIMEOUT = 0
USER_TOTAL_SPACE = 2 * pow(2,30)
# File upload
FILE_UPLOAD_MAX_MEMORY_SIZE = 0

View File

@@ -275,7 +275,7 @@ def render_repo(request, repo_id, error=''):
@login_required
def repo_upload_file(request, 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)
############ GET ############
if request.method == 'GET':