application/forms.py

@@ -6,7 +6,7 @@ from django.contrib.auth.forms import UserCreationForm, UserChangeForm
 class PostForm(forms.ModelForm):
     class Meta:
         model = Post
-        fields = ('title', 'text', 'published_date','tags')
+        fields = ('title', 'text', 'published_date', 'tags')
 
 class NewTagForm(forms.ModelForm):
     m_tags = TagField()

application/migrations/0003_auto_20180830_1814.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.1 on 2018-08-30 16:14
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('application', '0002_auto_20180818_1734'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='user',
-            field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

application/migrations/0004_auto_20180831_1019.py

@@ -1,20 +0,0 @@
-# Generated by Django 2.1 on 2018-08-31 08:19
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('application', '0003_auto_20180830_1814'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='customuser',
-            name='user',
-            field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
-        ),
-    ]

application/models.py

@@ -4,7 +4,7 @@ from django.utils import timezone
 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()
 
 

application/templates/base.html

@@ -31,20 +31,10 @@
                     <li class="nav-item">
                         <a class="nav-link" href="{% url 'admin:index' %}">Administration</a>
                     </li>
-                    <li>
-                        <a class="nav-link" href="{% url 'post_list' %}">Dashboard</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="{% url 'student_page' %}">Studentenansicht</a>
-                    </li>
                     {% elif user.is_staff %}
                     <li class="nav-item">
                         <a class="nav-link" href="{% url 'logout' %}">Administration</a>
                     </li>
-
-                    <li class="nav-item">
-                        <a class="nav-link" href="{% url 'post_list' %}">Dashboard</a>
-                    </li>
                     {% else %}
                     <li class="nav-item">
                         <a class="nav-link" href="{% url 'student_page' %}">{{user.get_username}}'s Dashboard</a>
@@ -70,7 +60,8 @@
                             <li>
                                 <form class="form" role="form" method="post" action="{% url 'login' %}" accept-charset="UTF-8" id="login-nav">
                                     {% csrf_token %} {% if next %}
-                                    <input type="hidden" name="next" value="{{ next }}" /> {% endif %}
+                                    <input type="hidden" name="next" value="{{ next }}" /> 
+                                    {% endif %}
                                     <div class="form-group">
                                         <label class="sr-only" for="username">Benutzername</label>
                                         <input type="text" class="form-control" id="username" name="username" placeholder="Benutzername" required>
@@ -101,7 +92,7 @@
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script>
         <script src="{% static 'bootstrap/js/jquery-1.11.1.js' %} "></script>
         <script src="{% static 'bootstrap/jsjquery.tagcanvas.min.js' %} " type="text/javascript"></script>
-        <script src="{% static 'js/app.js' %}"></script>
+        <script src="{% static 'js/app.js' %}"></script>   
         <script src="{% static 'bootstrap/js/bootstrap.bundle.js' %}"></script>
     </body>
 

application/templates/post_list.html

@@ -1,6 +1,4 @@
-{% extends 'base.html' %} {% block content %} 
-{% if tag %} Posts tagged with "{{ tag.name }}" {% endif %} 
-{% for post in posts %}
+{% extends 'base.html' %} {% block content %} {% for post in posts %} {% load taggit_templatetags2_tags %}
 <div class="post">
     <div class="date">
         {{ post.published_date }}
@@ -9,11 +7,15 @@
         <a href="{% url 'post_detail' pk=post.pk %}">{{ post.title }}</a>
     </h1>
     <p>{{ post.text|linebreaks }}</p>
-    Tags: {% for tag in post.tags.all %}
-    <a href="{% url 'post_list_by_tag' tag.slug %}">{{ tag.name }}</a>
-    {% if not forloop.last %}, {% endif %} {% endfor %} <p>
+    <p>
+        {% for tag in post.tags.all %}
+        <a href="">{{ tag.name }}, </a>
+        {% endfor %}
+    </p>
+    <p>
         {{ post.author }}
     </p>
+
 </div>
 {% endfor %} 
 </div>

application/templates/student_page.html

@@ -1,18 +1,5 @@
-{% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %} {% get_taglist as tags for 'application.post'%}
+{% extends "base.html" %} {% block content %}
 
-<div id="">
-    <ul>
-        {% for tag in tags %}
-        <li>{{tag}}
-            <a class="btn btn-outline-dark" href="{% url 'tag_remove' %}">
-                <span class="glyphicon glyphicon-remove">Remove</span>
-            </a>
-        </li>
-        {{ result }} {% endfor %}
-    </ul>
-</div>
-<div>
-</div>
 <form id="searchform" action="{% url 'blog_search_list_view' %}" method="get" accept-charset="utf-8">
     <button class="searchbutton" type="submit">
         <i class="fa fa-search"></i>
@@ -25,7 +12,8 @@
 </div>
 
 <form class="post-form" method="post">
-    {% csrf_token %} {{form.as_p}}
+    {% csrf_token %}
+    {{form.as_p}}
     <button type="submit" class="save btn btn-outline-dark">Save</button>
 </form>
 {% endblock %}

application/templates/tag_list.html

@@ -1,25 +0,0 @@
-{% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %} 
-{% get_taglist as tags for 'application.customuser'%}
-
-
-<div id="">
-    Your tags:
-    <ul>
-        {% for tag in tags %}
-        <li>
-            <a href="{% url 'post_list_by_tag' tag.slug %}">{{ tag }}</a>
-        </li>
-        {% endfor %}
-    </ul>
-</div>
-<div>
-    {{ tags }} {{ u }}
-</div>
-<div>
-     from List: {% for tag in tags %} 
-
-     {% for tag in posts %}
-    <p>{{ tag.name }} </p>{% endfor %}{% endfor %}
-
-</div>
-{% endblock %}

application/urls.py

@@ -5,9 +5,6 @@ from . import views
 
 urlpatterns = [
     url(r'^$', views.post_list, name='post_list'),
-    url(r'^tag/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
-    url(r'^taglist/$', views.tag_list, name='tag_list'),
-    url(r'^taglist/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
     url(r'^student/', views.student_page, name='student_page'),
     url(r'^search/', views.blog_search_list_view, name='blog_search_list_view'),
     url(r'^post/(?P<pk>\d+)/$', views.post_detail, name='post_detail'),
@@ -16,7 +13,6 @@ urlpatterns = [
     url(r'^drafts/$', views.post_draft_list, name='post_draft_list'),
     url(r'^post/(?P<pk>\d+)/publish/$', views.post_publish, name='post_publish'),
     url(r'^post/(?P<pk>\d+)/remove/$', views.post_remove, name='post_remove'),
-    url(r'^student/remove/$', views.tag_remove, name='tag_remove'),
-    url(r'^tags/', include('taggit_templatetags2.urls')),
+        url(r'^tags/', include('taggit_templatetags2.urls')),
 ]
 

application/views.py

@@ -1,16 +1,12 @@
 from django.shortcuts import render, get_object_or_404
 from django.utils import timezone
 from .models import Post, CustomUser
-from taggit.models import Tag
-from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from .forms import PostForm, NewTagForm
 from django.shortcuts import redirect
 from django.contrib.auth.decorators import login_required
 from django.contrib.admin.views.decorators import staff_member_required
 from django.contrib.auth import authenticate, login, logout
 from django.db.models import Q
-import sys
-import collections
 from taggit_templatetags2.views import TagCanvasListView
 
 import logging
@@ -46,13 +42,10 @@ def navlogin(request):
 
 
 @login_required
-def post_list(request, slug=None):
-    posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date')
-    if slug:
-        tag = get_object_or_404(Tag, slug=slug)
-        posts= posts.filter(tags__in=[tag])
-    page = request.GET.get('page')
-    return render(request, 'post_list.html', locals())
+def post_list(request):
+    posts = Post.objects.filter(
+        published_date__lte=timezone.now()).order_by('published_date')
+    return render(request, 'post_list.html', {'posts': posts})
 
 
 @login_required
@@ -86,7 +79,6 @@ def post_edit(request, pk):
             post = form.save(commit=False)
             post.author = request.user
             post.save()
-            form.save_m2m()
             return redirect('post_detail', pk=post.pk)
     else:
         form = PostForm(instance=post)
@@ -117,18 +109,9 @@ def post_remove(request, pk):
     return redirect('post_list')
 
 
-@login_required
-def tag_remove(request):
-    tag_to_delete = CustomUser.objects.get(tags)
-    obj.user = request.user
-    obj.save()
-    obj.tags.tag_remove(tag_to_delete)
-    obj.save_m2m()
-    return redirect('student_page')
-
 @login_required
 def student_page(request):
-    user_instance = get_object_or_404(CustomUser, user=request.user)
+    user_instance = CustomUser.objects.get(user=request.user)
     if request.method == "POST":
         form = NewTagForm(request.POST, instance=user_instance)
         if form.is_valid():
@@ -145,11 +128,7 @@ def student_page(request):
     
     return render(request, 'student_page.html', {'form':form})
 
-@login_required
-def tag_list(request):
-    u= CustomUser.objects.get(user=request.user)
-    tags= Tag.objects.filter(name=u)
-    return render(request, 'tag_list.html', locals())
+
     
 
 class TagSearch(TagCanvasListView):