diff --git a/subjects/admin.py b/subjects/admin.py index d22509a..9520dab 100644 --- a/subjects/admin.py +++ b/subjects/admin.py @@ -1,7 +1,7 @@ from django.contrib import admin -from .models import Subject, Marker -from .forms import CreateSubjectForm, CreateMarkerForm +from .models import Subject, Tag +from .forms import CreateSubjectForm, CreateTagForm class SubjectAdmin(admin.ModelAdmin): list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible', 'category'] @@ -9,11 +9,11 @@ class SubjectAdmin(admin.ModelAdmin): -class MarkerAdmin(admin.ModelAdmin): +class TagAdmin(admin.ModelAdmin): list_display = ['name'] search_fields = ['name'] - form = CreateMarkerForm + form = CreateTagForm admin.site.register(Subject, SubjectAdmin) -admin.site.register(Marker, MarkerAdmin) +admin.site.register(Tag, TagAdmin) diff --git a/subjects/forms.py b/subjects/forms.py index 8de7968..a9dad87 100644 --- a/subjects/forms.py +++ b/subjects/forms.py @@ -1,11 +1,11 @@ -from .models import Subject, Marker +from .models import Subject, Tag from django import forms class CreateSubjectForm(forms.ModelForm): # TODO: Define form fields here class Meta: model = Subject - fields = ('name', 'description_brief', 'description', 'markers', 'init_date', 'end_date', 'visible', 'professor', + fields = ('name', 'description_brief', 'description', 'tags', 'init_date', 'end_date', 'visible', 'professor', 'students', ) widgets = { @@ -17,8 +17,8 @@ class CreateSubjectForm(forms.ModelForm): -class CreateMarkerForm(forms.ModelForm): +class CreateTagForm(forms.ModelForm): class Meta: - model = Marker + model = Tag fields = ('name',) \ No newline at end of file diff --git a/subjects/migrations/0009_auto_20170105_1835.py b/subjects/migrations/0009_auto_20170105_1835.py new file mode 100644 index 0000000..be4ed4d --- /dev/null +++ b/subjects/migrations/0009_auto_20170105_1835.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.4 on 2017-01-05 21:35 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('subjects', '0008_auto_20170103_2044'), + ] + + operations = [ + migrations.RenameModel( + old_name='Marker', + new_name='Tag', + ), + migrations.RenameField( + model_name='subject', + old_name='markers', + new_name='tags', + ), + ] diff --git a/subjects/models.py b/subjects/models.py index e023487..b141a01 100644 --- a/subjects/models.py +++ b/subjects/models.py @@ -8,7 +8,7 @@ from users.models import User from categories.models import Category -class Marker(models.Model): +class Tag(models.Model): name = models.CharField( _("Name"), unique = True,max_length= 200) def __str__(self): return self.name @@ -25,7 +25,7 @@ class Subject(models.Model): init_date = models.DateField(_('Begin of Subject Date')) end_date = models.DateField(_('End of Subject Date')) - markers = models.ManyToManyField(Marker, verbose_name='markers', blank=True, null=True) + tags = models.ManyToManyField(Tag, verbose_name='markers', blank=True, null=True) create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True) update_date = models.DateTimeField(_('Date of last update'), auto_now=True) diff --git a/subjects/templates/subjects/initial.html b/subjects/templates/subjects/initial.html index 7a7e1ec..07ce36e 100644 --- a/subjects/templates/subjects/initial.html +++ b/subjects/templates/subjects/initial.html @@ -8,8 +8,8 @@