Revision b22da62e snf-astakos-app/astakos/im/quotas.py
| b/snf-astakos-app/astakos/im/quotas.py | ||
|---|---|---|
| 183 | 183 |
source_quota = {SYSTEM: dict(default_quotas)}
|
| 184 | 184 |
initial[uuid] = source_quota |
| 185 | 185 |
|
| 186 |
userids = [user.pk for user in users] |
|
| 186 | 187 |
objs = AstakosUserQuota.objects.select_related() |
| 187 |
orig_quotas = objs.filter(user__in=users)
|
|
| 188 |
orig_quotas = objs.filter(user__pk__in=userids)
|
|
| 188 | 189 |
for user_quota in orig_quotas: |
| 189 | 190 |
uuid = user_quota.user.uuid |
| 190 | 191 |
user_init = initial.get(uuid, {})
|
| ... | ... | |
| 201 | 202 |
return SYSTEM |
| 202 | 203 |
|
| 203 | 204 |
|
| 204 |
def astakos_users_quotas(users, initial=None):
|
|
| 205 |
def astakos_users_quotas(users): |
|
| 205 | 206 |
users = list(users) |
| 206 |
if initial is None: |
|
| 207 |
quotas = initial_quotas(users) |
|
| 208 |
else: |
|
| 209 |
quotas = copy.deepcopy(initial) |
|
| 207 |
quotas = initial_quotas(users) |
|
| 210 | 208 |
|
| 209 |
userids = [user.pk for user in users] |
|
| 211 | 210 |
ACTUALLY_ACCEPTED = ProjectMembership.ACTUALLY_ACCEPTED |
| 212 | 211 |
objs = ProjectMembership.objects.select_related( |
| 213 | 212 |
'project', 'person', 'project__application') |
| 214 | 213 |
memberships = objs.filter( |
| 215 |
person__in=users,
|
|
| 214 |
person__pk__in=userids,
|
|
| 216 | 215 |
state__in=ACTUALLY_ACCEPTED, |
| 217 | 216 |
project__state=Project.NORMAL, |
| 218 | 217 |
project__application__state=ProjectApplication.APPROVED) |
Also available in: Unified diff