Revision 5200e864 snf-astakos-app/astakos/im/models.py
b/snf-astakos-app/astakos/im/models.py | ||
---|---|---|
1340 | 1340 |
related_name='projects_applied', |
1341 | 1341 |
db_index=True) |
1342 | 1342 |
|
1343 |
project = models.ForeignKey(Project, |
|
1344 |
related_name='applications') |
|
1343 |
project = models.ForeignKey('Project', |
|
1344 |
related_name='applications', |
|
1345 |
null=True) |
|
1345 | 1346 |
|
1346 | 1347 |
state = models.CharField(max_length=80, |
1347 | 1348 |
default=UNKNOWN) |
... | ... | |
1500 | 1501 |
|
1501 | 1502 |
resource = models.ForeignKey(Resource) |
1502 | 1503 |
project_application = models.ForeignKey(ProjectApplication, |
1503 |
blank=True)
|
|
1504 |
null=True)
|
|
1504 | 1505 |
project_capacity = models.BigIntegerField(null=True) |
1505 | 1506 |
project_import_limit = models.BigIntegerField(null=True) |
1506 | 1507 |
project_export_limit = models.BigIntegerField(null=True) |
... | ... | |
1518 | 1519 |
|
1519 | 1520 |
application = models.OneToOneField( |
1520 | 1521 |
ProjectApplication, |
1521 |
related_name='project') |
|
1522 |
related_name='app_project')
|
|
1522 | 1523 |
last_approval_date = models.DateTimeField(null=True) |
1523 | 1524 |
|
1524 | 1525 |
members = models.ManyToManyField( |
... | ... | |
1715 | 1716 |
project = models.ForeignKey(Project) |
1716 | 1717 |
|
1717 | 1718 |
state = models.IntegerField(default=0) |
1718 |
application = models.ForeignKey(ProjectApplication, null=True) |
|
1719 |
pending_application = models.ForeignKey(ProjectApplication, null=True) |
|
1719 |
application = models.ForeignKey( |
|
1720 |
ProjectApplication, |
|
1721 |
null=True, |
|
1722 |
related_name='memberships') |
|
1723 |
pending_application = models.ForeignKey( |
|
1724 |
ProjectApplication, |
|
1725 |
null=True, |
|
1726 |
related_name='pending_memebrships') |
|
1720 | 1727 |
pending_serial = models.BigIntegerField(null=True, db_index=True) |
1721 | 1728 |
|
1722 | 1729 |
acceptance_date = models.DateField(null=True, db_index=True) |
... | ... | |
1758 | 1765 |
serial = history_item.id |
1759 | 1766 |
|
1760 | 1767 |
def accept(self): |
1768 |
state = self.state |
|
1761 | 1769 |
if state != self.REQUESTED: |
1762 | 1770 |
m = _("%s: attempt to accept in state [%s]") % (self, state) |
1763 | 1771 |
raise AssertionError(m) |
... | ... | |
1871 | 1879 |
serial = models.AutoField(primary_key=True) |
1872 | 1880 |
|
1873 | 1881 |
def new_serial(): |
1874 |
s = Serial.create() |
|
1882 |
s = Serial.objects.create()
|
|
1875 | 1883 |
return s.serial |
1876 | 1884 |
|
1877 | 1885 |
def sync_finish_serials(): |
... | ... | |
1880 | 1888 |
memberships = sfu.filter(pending_serial__isnull=False) |
1881 | 1889 |
|
1882 | 1890 |
for membership in memberships: |
1883 |
serial = membership.serial |
|
1891 |
serial = membership.pending_serial
|
|
1884 | 1892 |
# just make sure the project row is selected for update |
1885 | 1893 |
project = membership.project |
1886 | 1894 |
if serial in serials_to_ack: |
Also available in: Unified diff