X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=data%2Fmodels.py;fp=data%2Fmodels.py;h=60e60b308199b8f2e6d38ba3d35bbaf29ae70625;hb=b08a5d59143b9d711e7497cbade8598309a8c773;hp=33cae3016c98608c6cf2ef88710610eb047b1276;hpb=de123213707a6e22ab7d7c38ca7bc39eeacd7a98;p=demoscenemusic.git diff --git a/data/models.py b/data/models.py index 33cae30..60e60b3 100644 --- a/data/models.py +++ b/data/models.py @@ -35,16 +35,26 @@ class Release(models.Model): year = models.IntegerField() compo = models.ForeignKey(Compo) place = models.IntegerField() - pouetId = models.IntegerField(blank = True) + pouetId = models.IntegerField(blank = True, null = True) def __unicode__(self): return self.compo.__unicode__() + ' @ ' + self.party.__unicode__() + ' ' + '%d' % self.year +class TrackArtist(models.Model): + track = models.ForeignKey('Track') + artist = models.ForeignKey(Artist) + order = models.IntegerField() + +class RemixArtist(models.Model): + track = models.ForeignKey('Track') + artist = models.ForeignKey(Artist) + order = models.IntegerField() + class Track(models.Model): name = models.CharField(max_length = 150) - artists = models.ManyToManyField(Artist) + artists = models.ManyToManyField(Artist, through = TrackArtist) remix = models.CharField(max_length = 80, blank = True) - remixArtists = models.ManyToManyField(Artist, related_name = 'remixTracks', blank = True) + remixArtists = models.ManyToManyField(Artist, through = RemixArtist, related_name = 'remixTracks') releases = models.ManyToManyField(Release) length = models.IntegerField() soundcloudLink = models.CharField(max_length = 150, blank = True)