Revision b2369828 snf-astakos-app/astakos/im/forms.py
| b/snf-astakos-app/astakos/im/forms.py | ||
|---|---|---|
| 885 | 885 |
resource.name) |
| 886 | 886 |
d = model_to_dict(resource) |
| 887 | 887 |
if uplimit: |
| 888 |
d.update(dict(resource=prefix, uplimit=uplimit))
|
|
| 888 |
d.update(dict(resource=prefix, uplimit=long(uplimit)))
|
|
| 889 | 889 |
else: |
| 890 | 890 |
d.update(dict(resource=prefix, uplimit=None)) |
| 891 | 891 |
append(d) |
| ... | ... | |
| 902 | 902 |
return policies |
| 903 | 903 |
|
| 904 | 904 |
def cleaned_resource_policies(self): |
| 905 |
return [(d['name'], d['uplimit']) for d in self.resource_policies] |
|
| 905 |
policies = {}
|
|
| 906 |
for d in self.resource_policies: |
|
| 907 |
policies[d["name"]] = {
|
|
| 908 |
"project_capacity": None, |
|
| 909 |
"member_capacity": d["uplimit"] |
|
| 910 |
} |
|
| 911 |
|
|
| 912 |
return policies |
|
| 906 | 913 |
|
| 907 | 914 |
def save(self, commit=True): |
| 908 | 915 |
data = dict(self.cleaned_data) |
| 909 | 916 |
is_new = self.instance.id is None |
| 910 | 917 |
data['project_id'] = self.instance.chain.id if not is_new else None |
| 911 | 918 |
data['owner'] = self.user if is_new else self.instance.owner |
| 912 |
data['resource_policies'] = self.cleaned_resource_policies()
|
|
| 919 |
data['resources'] = self.cleaned_resource_policies() |
|
| 913 | 920 |
data['request_user'] = self.user |
| 914 | 921 |
submit_application(**data) |
| 915 | 922 |
|
Also available in: Unified diff