diff --git a/api/views.py b/api/views.py index 51a9003..18065cf 100644 --- a/api/views.py +++ b/api/views.py @@ -235,7 +235,8 @@ def NCAddUser(request): "password": password, "displayName": displayName, "email":email, - "groups[]":groups + "groups[]":groups, + "quota": 104857600 } headers = { diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 252a0f6..96a41b7 100644 Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py index bb7ac13..1500a18 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -1203,16 +1203,18 @@ def getUserQuotaData(userdata): quotadata = [int(s) for s in re.findall('(.+?)', r.text)] inuse = [int(s) for s in re.findall('(.+?)', r.text)] - - i = int(math.floor(math.log(quotadata[0], 1024))) - p = math.pow(1024, i) - # s for textlabel - s = round(quotadata[0] / p, 2) + quotadata_value = quotadata[0] + valuequota_MB = 0 + counter = 0 + while(quotadata_value > 9999 or counter > 3): + quotadata_value = quotadata_value / 1024 + counter += 1 + + valuequota_MB = round(quotadata_value, 0) + # PERCENT percent = (100 / int(quotadata[0]))*int(inuse[0]) - # TODO: Hier werden GB nicht korrekt umgerechnet in MB - - return [quotadata[0], inuse[0], str(round(percent, 0)).replace(",", "."), str(s).split(".")[0]] + return [quotadata[0], inuse[0], str(round(percent, 0)).replace(",", "."), str(valuequota_MB).split(".")[0]]