rc/aircox
13
1
Fork 1
Code Issues 15 Pull Requests Projects Releases Wiki Activity

small fixes and tests

Browse Source
This commit is contained in:
bkfox
2015-11-03 10:55:20 +01:00
parent 2039579061
commit 86bc9c1251
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
aircox_programs/models.py
View File

@ -34,8 +34,8 @@ class Nameable (models.Model):
return slugify(self.name)
def __str__ (self):
if self.pk:
return '#{} {}'.format(self.pk, self.name)
#if self.pk:
# return '#{} {}'.format(self.pk, self.name)
return '{}'.format(self.name)
class Meta:
@ -391,7 +391,7 @@ class Diffusion (models.Model):
verbose_name_plural = _('Diffusions')
class Stream (models.Model):
class Stream (Nameable):
Type = {
'random': 0x00, # selection using random function
'schedule': 0x01, # selection using schedule
@ -399,11 +399,6 @@ class Stream (models.Model):
for key, value in Type.items():
ugettext_lazy(key)
name = models.CharField(
_('name'),
max_length = 32,
blank = True, null = True,
)
public = models.BooleanField(
_('public'),
default = True,
@ -435,9 +430,6 @@ class Stream (models.Model):
# - random lists
# - scheduled lists
def __str__ (self):
return '#{} {}'.format(self.priority, self.name)
class Program (Nameable):
stream = models.ForeignKey(