modified Marker model to Tag model

Felipe Henrique de Almeida Bormann
1 parent 1fcb7055
Showing 6 changed files with 40 additions and 16 deletions Show diff stats
subjects/admin.py
subjects/forms.py
subjects/migrations/0009_auto_20170105_1835.py
subjects/models.py
subjects/templates/subjects/initial.html
subjects/views.py
 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)
-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
@@ -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',
+        ),
+    ]
@@ -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)
@@ -8,8 +8,8 @@
 		<div class="users-cloud div-users-cloud">
 			<ul class=" users-cloud">
-				{% for marker in markers %}
-					<li>{{marker.name}}</li>
+				{% for tag in tags %}
+					<li>{{tag.name}}</li>
 				{% endfor %}
 			</ul>
 		</div>
@@ -21,7 +21,7 @@ from log.mixins import LogMixin
 from log.decorators import log_decorator_ajax
 from log.models import Log
-from .models import Marker
+from .models import Tag
 import time
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import CreateSubjectForm
@@ -54,8 +54,8 @@ class HomeView(LoginRequiredMixin, ListView):
         context['title'] = _('Home')
         #bringing users
-        markers = Marker.objects.all()
-        context['markers'] = markers
+        tags = Tag.objects.all()
+        context['tags'] = tags
         return context
1	-from .models import Subject, Marker	1	+from .models import Subject, Tag
2	from django import forms	2	from django import forms
3	class CreateSubjectForm(forms.ModelForm):	3	class CreateSubjectForm(forms.ModelForm):
4	# TODO: Define form fields here	4	# TODO: Define form fields here
5	class Meta:	5	class Meta:
6	model = Subject	6	model = Subject
7		7
8	- fields = ('name', 'description_brief', 'description', 'markers', 'init_date', 'end_date', 'visible', 'professor',	8	+ fields = ('name', 'description_brief', 'description', 'tags', 'init_date', 'end_date', 'visible', 'professor',
9	'students', )	9	'students', )
10		10
11	widgets = {	11	widgets = {
	@@ -17,8 +17,8 @@ class CreateSubjectForm(forms.ModelForm):		@@ -17,8 +17,8 @@ class CreateSubjectForm(forms.ModelForm):
17		17
18		18
19		19
20	-class CreateMarkerForm(forms.ModelForm):	20	+class CreateTagForm(forms.ModelForm):
21	class Meta:	21	class Meta:
22	- model = Marker	22	+ model = Tag
23	fields = ('name',)	23	fields = ('name',)
24		24
25	\ No newline at end of file	25	\ No newline at end of file
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+# -- coding: utf-8 --
	2	+# Generated by Django 1.10.4 on 2017-01-05 21:35
	3	+from __future__ import unicode_literals
	4	+
	5	+from django.db import migrations
	6	+
	7	+
	8	+class Migration(migrations.Migration):
	9	+
	10	+ dependencies = [
	11	+ ('subjects', '0008_auto_20170103_2044'),
	12	+ ]
	13	+
	14	+ operations = [
	15	+ migrations.RenameModel(
	16	+ old_name='Marker',
	17	+ new_name='Tag',
	18	+ ),
	19	+ migrations.RenameField(
	20	+ model_name='subject',
	21	+ old_name='markers',
	22	+ new_name='tags',
	23	+ ),
	24	+ ]
	@@ -8,7 +8,7 @@ from users.models import User		@@ -8,7 +8,7 @@ from users.models import User
8		8
9	from categories.models import Category	9	from categories.models import Category
10		10
11	-class Marker(models.Model):	11	+class Tag(models.Model):
12	name = models.CharField( _("Name"), unique = True,max_length= 200)	12	name = models.CharField( _("Name"), unique = True,max_length= 200)
13	def __str__(self):	13	def __str__(self):
14	return self.name	14	return self.name
	@@ -25,7 +25,7 @@ class Subject(models.Model):		@@ -25,7 +25,7 @@ class Subject(models.Model):
25	init_date = models.DateField(_('Begin of Subject Date'))	25	init_date = models.DateField(_('Begin of Subject Date'))
26	end_date = models.DateField(_('End of Subject Date'))	26	end_date = models.DateField(_('End of Subject Date'))
27		27
28	- markers = models.ManyToManyField(Marker, verbose_name='markers', blank=True, null=True)	28	+ tags = models.ManyToManyField(Tag, verbose_name='markers', blank=True, null=True)
29		29
30	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)	30	create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
31	update_date = models.DateTimeField(_('Date of last update'), auto_now=True)	31	update_date = models.DateTimeField(_('Date of last update'), auto_now=True)