Revision 37d59b27 snf-astakos-app/astakos/im/presentation.py
b/snf-astakos-app/astakos/im/presentation.py | ||
---|---|---|
32 | 32 |
# or implied, of GRNET S.A. |
33 | 33 |
|
34 | 34 |
from astakos.im import settings |
35 |
from synnefo.lib.utils import dict_merge |
|
35 | 36 |
|
36 | 37 |
RESOURCES = { |
37 | 38 |
'groups': { |
... | ... | |
132 | 133 |
'verbose_name': 'Private Network', |
133 | 134 |
'group': 'network' |
134 | 135 |
|
135 |
} |
|
136 |
}, |
|
137 |
'astakos.pending_app': { |
|
138 |
'help_text': ('Pending project applications limit'), |
|
139 |
'help_text_input_each': ('Total pending project applications user ' |
|
140 |
'is allowed to create'), |
|
141 |
'is_abbreviation': False, |
|
142 |
'report_desc': 'Pending Project Applications', |
|
143 |
'placeholder': 'eg. 2', |
|
144 |
'verbose_name': 'pending project application', |
|
145 |
'group': 'accounts' |
|
146 |
|
|
147 |
}, |
|
136 | 148 |
}, |
137 |
'groups_order': ['storage', 'compute', 'network'], |
|
149 |
'groups_order': ['storage', 'compute', 'network', 'accounts'],
|
|
138 | 150 |
'resources_order': ['pithos.diskspace', |
139 | 151 |
'cyclades.disk', |
140 | 152 |
'cyclades.cpu', |
141 | 153 |
'cyclades.ram', |
142 | 154 |
'cyclades.vm', |
143 |
'cyclades.network.private' |
|
144 |
] |
|
155 |
'cyclades.network.private', |
|
156 |
'astakos.pending_app' |
|
157 |
], |
|
158 |
'exclude_from_usage': [] |
|
145 | 159 |
} |
146 | 160 |
|
161 |
# extend from settings |
|
162 |
RESOURCES = dict_merge(RESOURCES, settings.RESOURCES_META) |
|
163 |
|
|
147 | 164 |
|
148 | 165 |
def service_defaults(service_name): |
149 | 166 |
""" |
Also available in: Unified diff