diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-18 16:11:31 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2011-03-18 16:11:31 -0300 |
commit | 37075e5f3423a69fec03faf31ce2133c55374dfc (patch) | |
tree | 7403d5eefd5f20ab2a496dbbb9d9841b06e2e385 /main/models.py | |
parent | 30b2a1954d5bf63c78fe654a0c0bb98508e2f3e2 (diff) | |
parent | aca7700dd7519d45e677e18b1a0199f3712ce140 (diff) |
Merge branch 'master' of git://projects.archlinux.org/archweb
Conflicts:
templates/packages/details.html
templates/packages/files.html
Diffstat (limited to 'main/models.py')
-rw-r--r-- | main/models.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/main/models.py b/main/models.py index a7cc2335..24befddd 100644 --- a/main/models.py +++ b/main/models.py @@ -107,6 +107,7 @@ class Package(models.Model): pkgbase = models.CharField(max_length=255, db_index=True) pkgver = models.CharField(max_length=255) pkgrel = models.CharField(max_length=255) + epoch = models.PositiveIntegerField(default=0) pkgdesc = models.CharField(max_length=255, null=True) url = models.CharField(max_length=255, null=True) filename = models.CharField(max_length=255) @@ -130,6 +131,12 @@ class Package(models.Model): def __unicode__(self): return self.pkgname + @property + def full_version(self): + if self.epoch > 0: + return u'%d:%s-%s' % (self.epoch, self.pkgver, self.pkgrel) + return u'%s-%s' % (self.pkgver, self.pkgrel) + def get_absolute_url(self): return '/packages/%s/%s/%s/' % (self.repo.name.lower(), self.arch.name, self.pkgname) @@ -286,7 +293,8 @@ class Package(models.Model): 'is this package similar, name and version-wise, to another' return self.pkgname == other.pkgname \ and self.pkgver == other.pkgver \ - and self.pkgrel == other.pkgrel + and self.pkgrel == other.pkgrel \ + and self.epoch == other.epoch def in_testing(self): '''attempt to locate this package in a testing repo; if we are in @@ -341,7 +349,7 @@ class Todolist(models.Model): creator = models.ForeignKey(User) name = models.CharField(max_length=255) description = models.TextField() - date_added = models.DateField(auto_now_add=True) + date_added = models.DateTimeField(auto_now_add=True) objects = TodolistManager() def __unicode__(self): return self.name |