new migration

This commit is contained in:
Esther Kleinhenz
2018-10-20 17:28:50 +02:00
parent 7d0350d452
commit 4a753ff6c9
4 changed files with 41 additions and 4 deletions
@@ -0,0 +1,18 @@
# Generated by Django 2.1 on 2018-10-19 14:45
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('application', '0004_auto_20180831_1019'),
]
operations = [
migrations.RenameField(
model_name='customuser',
old_name='mytags',
new_name='tags',
),
]
+1 -2
View File
@@ -5,8 +5,7 @@ from taggit.managers import TaggableManager
class CustomUser(models.Model):
user = models.OneToOneField(
'auth.User', null=True, on_delete=models.CASCADE)
user = models.OneToOneField(User, null=True, on_delete=models.CASCADE)
tags = TaggableManager()
+5 -2
View File
@@ -12,6 +12,8 @@ from django.db.models import Q
import sys
import collections
from taggit_templatetags2.views import TagCanvasListView
from django.contrib.auth.models import User
import logging
import mysite.settings
@@ -144,7 +146,8 @@ def student_page(request):
def tag_list(request):
log = logging.getLogger('mysite')
u = CustomUser.objects.get(user=request.user)
tags= Tag.objects.filter(name=u)
log.info(u)
tags = Tag.objects.filter(customuser__user = u)
log.info(tags)
arr = []
for tag in tags:
@@ -155,7 +158,7 @@ def tag_list(request):
arr.append(str(tag))
listing = list(arr)
"""
return render(request, 'tag_list.html', {'arr':arr})
return render(request, 'tag_list.html', locals())
class TagSearch(TagCanvasListView):
template_name = 'blog_search_list_view.html'