Revision 670de92a snf-astakos-app/astakos/im/models.py
| b/snf-astakos-app/astakos/im/models.py | ||
|---|---|---|
| 197 | 197 |
def quota(self): |
| 198 | 198 |
d = defaultdict(int) |
| 199 | 199 |
for q in self.astakosgroupquota_set.all(): |
| 200 |
d[q.resource] += q.limit |
|
| 200 |
d[q.resource] += q.uplimit
|
|
| 201 | 201 |
return d |
| 202 | 202 |
|
| 203 | 203 |
@property |
| ... | ... | |
| 296 | 296 |
def quota(self): |
| 297 | 297 |
d = defaultdict(int) |
| 298 | 298 |
for q in self.astakosuserquota_set.all(): |
| 299 |
d[q.resource.name] += q.limit |
|
| 299 |
d[q.resource.name] += q.uplimit
|
|
| 300 | 300 |
for m in self.membership_set.all(): |
| 301 | 301 |
if not m.is_approved: |
| 302 | 302 |
continue |
| 303 | 303 |
g = m.group |
| 304 | 304 |
if not g.is_enabled: |
| 305 | 305 |
continue |
| 306 |
for r, limit in g.quota.iteritems(): |
|
| 307 |
d[r] += limit |
|
| 306 |
for r, uplimit in g.quota.iteritems():
|
|
| 307 |
d[r] += uplimit
|
|
| 308 | 308 |
# TODO set default for remaining |
| 309 | 309 |
return d |
| 310 | 310 |
|
| ... | ... | |
| 417 | 417 |
|
| 418 | 418 |
|
| 419 | 419 |
class AstakosGroupQuota(models.Model): |
| 420 |
limit = models.PositiveIntegerField('Limit')
|
|
| 420 |
limit = models.PositiveIntegerField('Limit') # obsolete field
|
|
| 421 |
uplimit = models.BigIntegerField('Up limit', null=True)
|
|
| 421 | 422 |
resource = models.ForeignKey(Resource) |
| 422 | 423 |
group = models.ForeignKey(AstakosGroup, blank=True) |
| 423 | 424 |
|
| ... | ... | |
| 426 | 427 |
|
| 427 | 428 |
|
| 428 | 429 |
class AstakosUserQuota(models.Model): |
| 429 |
limit = models.PositiveIntegerField('Limit')
|
|
| 430 |
limit = models.PositiveIntegerField('Limit') # obsolete field
|
|
| 431 |
uplimit = models.BigIntegerField('Up limit', null=True)
|
|
| 430 | 432 |
resource = models.ForeignKey(Resource) |
| 431 | 433 |
user = models.ForeignKey(AstakosUser) |
| 432 | 434 |
|
Also available in: Unified diff