Revision 3e87075a snf-astakos-app/astakos/im/forms.py
b/snf-astakos-app/astakos/im/forms.py | ||
---|---|---|
45 | 45 |
from django.db import transaction |
46 | 46 |
from django.core import validators |
47 | 47 |
|
48 |
from synnefo.util import units |
|
48 | 49 |
from synnefo_branding.utils import render_to_string |
49 | 50 |
from synnefo.lib import join_urls |
50 | 51 |
from astakos.im.models import AstakosUser, EmailChange, Invitation, Resource, \ |
... | ... | |
883 | 884 |
raise forms.ValidationError("Invalid resource %s" % |
884 | 885 |
resource.name) |
885 | 886 |
d = model_to_dict(resource) |
886 |
if uplimit: |
|
887 |
d.update(dict(resource=prefix, uplimit=long(uplimit))) |
|
888 |
else: |
|
889 |
d.update(dict(resource=prefix, uplimit=None)) |
|
887 |
try: |
|
888 |
uplimit = long(uplimit) |
|
889 |
except ValueError: |
|
890 |
m = "Limit should be an integer" |
|
891 |
raise forms.ValidationError(m) |
|
892 |
display = units.show(uplimit, resource.unit) |
|
893 |
d.update(dict(resource=prefix, uplimit=uplimit, |
|
894 |
display_uplimit=display)) |
|
890 | 895 |
append(d) |
891 | 896 |
|
892 | 897 |
ordered_keys = presentation.RESOURCES['resources_order'] |
Also available in: Unified diff