fnp
/
koed-quiz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Single instance deployment.
[koed-quiz.git]
/
apps
/
quiz
/
models.py
diff --git
a/apps/quiz/models.py
b/apps/quiz/models.py
index
b5e588d
..
8916ce9
100644
(file)
--- a/
apps/quiz/models.py
+++ b/
apps/quiz/models.py
@@
-4,6
+4,7
@@
#
from django.db import models
from django.contrib.sites.models import Site
#
from django.db import models
from django.contrib.sites.models import Site
+from django.utils.encoding import python_2_unicode_compatible
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from django.utils.translation import ugettext_lazy as _
from django.conf import settings
@@
-18,8
+19,8
@@
class Quiz(Site):
verbose_name_plural = _('quizzes')
@classmethod
verbose_name_plural = _('quizzes')
@classmethod
- def current(cls):
- return cls.objects.get(
id=settings.SITE_ID
)
+ def current(cls
, request
):
+ return cls.objects.get(
domain=request.get_host()
)
def start(self):
return self.question_set.all()[0]
def start(self):
return self.question_set.all()[0]
@@
-36,6
+37,7
@@
class Quiz(Site):
return self.get_absolute_url()
return self.get_absolute_url()
+@python_2_unicode_compatible
class Result(models.Model):
quiz = models.ForeignKey(Quiz)
slug = models.SlugField(db_index=True)
class Result(models.Model):
quiz = models.ForeignKey(Quiz)
slug = models.SlugField(db_index=True)
@@
-47,7
+49,7
@@
class Result(models.Model):
verbose_name_plural = _('results')
ordering = ['quiz', 'title']
verbose_name_plural = _('results')
ordering = ['quiz', 'title']
- def __
unicode
__(self):
+ def __
str
__(self):
return self.title
@models.permalink
return self.title
@models.permalink
@@
-55,6
+57,7
@@
class Result(models.Model):
return ('quiz_result', [self.slug])
return ('quiz_result', [self.slug])
+@python_2_unicode_compatible
class Question(models.Model):
quiz = models.ForeignKey(Quiz)
slug = models.SlugField(db_index=True)
class Question(models.Model):
quiz = models.ForeignKey(Quiz)
slug = models.SlugField(db_index=True)
@@
-69,7
+72,7
@@
class Question(models.Model):
ordering = ['quiz', 'ordering']
unique_together = [['quiz', 'slug'], ['quiz', 'ordering']]
ordering = ['quiz', 'ordering']
unique_together = [['quiz', 'slug'], ['quiz', 'ordering']]
- def __
unicode
__(self):
+ def __
str
__(self):
return self.title
@models.permalink
return self.title
@models.permalink
@@
-84,7
+87,7
@@
class Question(models.Model):
return self.quiz.where_to()
return self.quiz.where_to()
-
+@python_2_unicode_compatible
class Answer(models.Model):
title = models.CharField(max_length=255)
question = models.ForeignKey(Question)
class Answer(models.Model):
title = models.CharField(max_length=255)
question = models.ForeignKey(Question)
@@
-98,7
+101,7
@@
class Answer(models.Model):
verbose_name_plural = _('answers')
ordering = ['question', 'ordering']
verbose_name_plural = _('answers')
ordering = ['question', 'ordering']
- def __
unicode
__(self):
+ def __
str
__(self):
return self.title
def where_to(self):
return self.title
def where_to(self):