Revision 26551b92 snf-astakos-app/astakos/im/templatetags/filters.py
b/snf-astakos-app/astakos/im/templatetags/filters.py | ||
---|---|---|
42 | 42 |
from django.db.models.query import QuerySet |
43 | 43 |
|
44 | 44 |
|
45 |
from astakos.im.settings import PAGINATE_BY |
|
46 |
from astakos.im.presentation import RESOURCES_PRESENTATION_DATA |
|
47 |
from astakos.im.models import RESOURCE_SEPARATOR, ProjectResourceGrant |
|
45 |
from astakos.im import settings |
|
46 |
from astakos.im.models import ProjectResourceGrant |
|
48 | 47 |
|
49 | 48 |
register = template.Library() |
50 | 49 |
|
... | ... | |
203 | 202 |
grants = project_definition.projectresourcegrant_set |
204 | 203 |
grants = grants.values_list( |
205 | 204 |
'resource__name', |
206 |
'resource__service__name', |
|
207 | 205 |
'member_capacity' |
208 | 206 |
) |
209 |
return dict((RESOURCE_SEPARATOR.join([e[1], e[0]]), e[2]) for e in grants)
|
|
207 |
return dict((e[0], e[1]) for e in grants)
|
|
210 | 208 |
except: |
211 | 209 |
return {} |
Also available in: Unified diff