Download as
Browse Code »

Commit 9ea7091ac7963710cf0b94a86dbdad152c33650c

Authored by Felipe Henrique de Almeida Bormann
1 parent 1fcb7055
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

modified Marker model to Tag model

Showing 6 changed files with 40 additions and 16 deletions   Show diff stats
subjects/admin.py
  Diff comments   View file @9ea7091
1 1  
2 2 from django.contrib import admin
3   -from .models import Subject, Marker
4   -from .forms import CreateSubjectForm, CreateMarkerForm
  3 +from .models import Subject, Tag
  4 +from .forms import CreateSubjectForm, CreateTagForm
5 5  
6 6 class SubjectAdmin(admin.ModelAdmin):
7 7 list_display = ['name', 'description_brief', 'description', 'init_date', 'end_date', 'visible', 'category']
... ... @@ -9,11 +9,11 @@ class SubjectAdmin(admin.ModelAdmin):
9 9  
10 10  
11 11  
12   -class MarkerAdmin(admin.ModelAdmin):
  12 +class TagAdmin(admin.ModelAdmin):
13 13 list_display = ['name']
14 14 search_fields = ['name']
15   - form = CreateMarkerForm
  15 + form = CreateTagForm
16 16  
17 17 admin.site.register(Subject, SubjectAdmin)
18   -admin.site.register(Marker, MarkerAdmin)
  18 +admin.site.register(Tag, TagAdmin)
19 19  
... ...
subjects/forms.py
  Diff comments   View file @9ea7091
1   -from .models import Subject, Marker
  1 +from .models import Subject, Tag
2 2 from django import forms
3 3 class CreateSubjectForm(forms.ModelForm):
4 4 # TODO: Define form fields here
5 5 class Meta:
6 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 9 'students', )
10 10  
11 11 widgets = {
... ... @@ -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 21 class Meta:
22   - model = Marker
  22 + model = Tag
23 23 fields = ('name',)
24 24  
25 25 \ No newline at end of file
... ...
subjects/migrations/0009_auto_20170105_1835.py 0 → 100644
  Diff comments   View file @9ea7091
... ... @@ -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 + ]
... ...
subjects/models.py
  Diff comments   View file @9ea7091
... ... @@ -8,7 +8,7 @@ from users.models import User
8 8  
9 9 from categories.models import Category
10 10  
11   -class Marker(models.Model):
  11 +class Tag(models.Model):
12 12 name = models.CharField( _("Name"), unique = True,max_length= 200)
13 13 def __str__(self):
14 14 return self.name
... ... @@ -25,7 +25,7 @@ class Subject(models.Model):
25 25 init_date = models.DateField(_('Begin of Subject Date'))
26 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 30 create_date = models.DateTimeField(_('Creation Date'), auto_now_add = True)
31 31 update_date = models.DateTimeField(_('Date of last update'), auto_now=True)
... ...
subjects/templates/subjects/initial.html
  Diff comments   View file @9ea7091
... ... @@ -8,8 +8,8 @@
8 8  
9 9 <div class="users-cloud div-users-cloud">
10 10 <ul class=" users-cloud">
11   - {% for marker in markers %}
12   - <li>{{marker.name}}</li>
  11 + {% for tag in tags %}
  12 + <li>{{tag.name}}</li>
13 13 {% endfor %}
14 14 </ul>
15 15 </div>
... ...
subjects/views.py
  Diff comments   View file @9ea7091
... ... @@ -21,7 +21,7 @@ from log.mixins import LogMixin
21 21 from log.decorators import log_decorator_ajax
22 22 from log.models import Log
23 23  
24   -from .models import Marker
  24 +from .models import Tag
25 25 import time
26 26 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
27 27 from .forms import CreateSubjectForm
... ... @@ -54,8 +54,8 @@ class HomeView(LoginRequiredMixin, ListView):
54 54 context['title'] = _('Home')
55 55  
56 56 #bringing users
57   - markers = Marker.objects.all()
58   - context['markers'] = markers
  57 + tags = Tag.objects.all()
  58 + context['tags'] = tags
59 59 return context
60 60  
61 61  
... ...