summaryrefslogtreecommitdiff
path: root/yaksh/models.py
diff options
context:
space:
mode:
authorCruiseDevice2020-04-14 20:13:52 +0530
committerCruiseDevice2020-04-14 20:13:52 +0530
commit508e0e78bb0bd3e8ebbad81e948f13de5c01b20f (patch)
tree1c320cf927c4f594c11ad86f564dc82f206a2a39 /yaksh/models.py
parent2f9331717075b34534f2745706f57a98f7dce20d (diff)
downloadonline_test-508e0e78bb0bd3e8ebbad81e948f13de5c01b20f.tar.gz
online_test-508e0e78bb0bd3e8ebbad81e948f13de5c01b20f.tar.bz2
online_test-508e0e78bb0bd3e8ebbad81e948f13de5c01b20f.zip
Change model name Thread to Post to avoid conflicts
- Thread class from threading conflicts with the forum Thread model. - Tests for models and views. - PEP8 fix.
Diffstat (limited to 'yaksh/models.py')
-rw-r--r--yaksh/models.py21
1 files changed, 12 insertions, 9 deletions
diff --git a/yaksh/models.py b/yaksh/models.py
index d76d6aa..424e2f5 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -243,9 +243,10 @@ def validate_image(image):
def get_image_dir(instance, filename):
return os.sep.join((
- 'thread_%s' % (instance), filename
+ 'post_%s' % (instance), filename
))
+
###############################################################################
class CourseManager(models.Manager):
@@ -1176,7 +1177,9 @@ class CourseStatus(models.Model):
if self.is_course_complete():
self.calculate_percentage()
if self.course.grading_system is None:
- grading_system = GradingSystem.objects.get(name__contains='default')
+ grading_system = GradingSystem.objects.get(
+ name__contains='default'
+ )
else:
grading_system = self.course.grading_system
grade = grading_system.get_grade(self.percentage)
@@ -2646,6 +2649,7 @@ class TestCaseOrder(models.Model):
# Order of the test case for a question.
order = models.TextField()
+
##############################################################################
class ForumBase(models.Model):
uid = models.UUIDField(unique=True, default=uuid.uuid4, editable=False)
@@ -2653,15 +2657,15 @@ class ForumBase(models.Model):
description = models.TextField()
created_at = models.DateTimeField(auto_now_add=True)
modified_at = models.DateTimeField(auto_now=True)
- image = models.ImageField(upload_to=get_image_dir, blank=True,
+ image = models.ImageField(upload_to=get_image_dir, blank=True,
null=True, validators=[validate_image])
active = models.BooleanField(default=True)
-class Thread(ForumBase):
+class Post(ForumBase):
title = models.CharField(max_length=200)
course = models.ForeignKey(Course,
- on_delete=models.CASCADE, related_name='thread')
+ on_delete=models.CASCADE, related_name='post')
def __str__(self):
return self.title
@@ -2674,10 +2678,9 @@ class Thread(ForumBase):
class Comment(ForumBase):
- thread_field = models.ForeignKey(Thread,
- on_delete=models.CASCADE,
- related_name='comment')
+ post_field = models.ForeignKey(Post, on_delete=models.CASCADE,
+ related_name='comment')
def __str__(self):
return 'Comment by {0}: {1}'.format(self.creator.username,
- self.thread_field.title)
+ self.post_field.title)