From f34a20a80cdb013ec646331f0edbf6974d163fd6 Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Wed, 7 Sep 2016 22:02:36 -0300 Subject: [PATCH] Form de subject #30 --- courses/forms.py | 14 +++++++------- courses/models.py | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/courses/forms.py b/courses/forms.py index 8e17fad..3e5cc87 100644 --- a/courses/forms.py +++ b/courses/forms.py @@ -1,6 +1,6 @@ from django import forms from django.utils.translation import ugettext_lazy as _ -from .models import Category, Course, Module +from .models import Category, Course, Subject class CategoryForm(forms.ModelForm): @@ -49,10 +49,10 @@ class CourseForm(forms.ModelForm): 'categoy': forms.Select(), } -class ModuleForm(forms.ModelForm): +class SubjectForm(forms.ModelForm): class Meta: - model = Module + model = Subject fields = ('name', 'description', 'visible',) labels = { 'name': _('Name'), @@ -60,7 +60,7 @@ class ModuleForm(forms.ModelForm): 'visible': _('Is it visible?'), } help_texts = { - 'name': _("Module's name"), - 'description': _("Modules's description"), - 'visible': _('Is the module visible?'), - } \ No newline at end of file + 'name': _("Subjects's name"), + 'description': _("Subjects's description"), + 'visible': _('Is the subject visible?'), + } diff --git a/courses/models.py b/courses/models.py index 8a744d1..04a9995 100644 --- a/courses/models.py +++ b/courses/models.py @@ -1,5 +1,6 @@ from django.utils.translation import ugettext_lazy as _ from django.db import models +from autoslug.fields import AutoSlugField from users.models import User class Category(models.Model): @@ -39,19 +40,20 @@ class Course(models.Model): def __str__(self): return self.name -class Module(models.Model): +class Subject(models.Model): name = models.CharField(_('Name'), max_length = 100) - slug = models.SlugField(_('Slug'), max_length = 100) + slug = AutoSlugField(_("Slug"),populate_from='name',unique=True) description = models.TextField(_('Description'), blank = True) visible = models.BooleanField(_('Visible'), default = True, blank = True) - create_date = models.DateField(_('Creation Date'), auto_now_add = True) - course = models.ForeignKey(Course, verbose_name = _('Course')) + create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) + update_date = models.DateTimeField(_('Date of last update'), auto_now=True) + course = models.ForeignKey(Course, verbose_name = _('Course'), related_name="subjects") class Meta: - verbose_name = _('Module') - verbose_name_plural = _('Modules') + verbose_name = _('Subject') + verbose_name_plural = _('Subjects') def __str__(self): - return self.name \ No newline at end of file + return self.name -- libgit2 0.21.2