check references and added comments to forms url and admin

This commit is contained in:
Esther Kleinhenz
2018-12-09 11:26:21 +01:00
parent 25b0385a87
commit db60f32c07
13 changed files with 137 additions and 204 deletions
+7 -3
View File
@@ -1,24 +1,28 @@
from django.contrib import admin
from django.contrib.auth import get_user_model
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from django.contrib.auth.models import User
from .models import Post, CustomUser
#external code customised
#import from https://docs.djangoproject.com/en/dev/topics/auth/customizing/#extending-the-existing-user-model
class CustomUserInline(admin.StackedInline):
model = CustomUser
can_delete = False
verbose_name_plural = 'customUsers'
#external code customised
#import from https://docs.djangoproject.com/en/dev/topics/auth/customizing/#extending-the-existing-user-model
# Define a new User admin
class UserAdmin(BaseUserAdmin):
inlines = (CustomUserInline, )
#external code customised
#import from https://docs.djangoproject.com/en/dev/topics/auth/customizing/#extending-the-existing-user-model
# Re-register UserAdmin
admin.site.unregister(User)
admin.site.register(User, UserAdmin)
admin.site.register(Post)
+6
View File
@@ -3,15 +3,21 @@ from datetime import datetime
from .models import Post, CustomUser
from django.forms import ModelForm, ValidationError
from taggit.forms import *
#extended code customised
#import from https://tutorial.djangogirls.org/en/django_forms/
class PostForm(forms.ModelForm):
class Meta:
model = Post
fields = ('title', 'text', 'published_date','tags')
class NewTagForm(forms.ModelForm):
tags = TagField()
class Meta:
model = CustomUser
fields = ['tags']
+7 -1
View File
@@ -2,11 +2,14 @@ from django.conf import settings
from django.conf.urls import url
from django.conf.urls import include
from django.urls import path
from taggit_templatetags2 import urls as taggit_templatetags2_urls
from . import views
from taggit_templatetags2 import urls as taggit_templatetags2_urls
import debug_toolbar
urlpatterns = [
url(r'^$', views.tag_list, name='tag_list'),
url(r'^tag/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
@@ -22,6 +25,9 @@ urlpatterns = [
url(r'^tags/', include('taggit_templatetags2.urls')),
]
#external code
#import from https://django-debug-toolbar.readthedocs.io/en/latest/installation.html
if settings.DEBUG:
import debug_toolbar
urlpatterns += [
-11
View File
@@ -124,17 +124,6 @@ def post_remove(request, pk):
return redirect('post_list')
""" @login_required
def tag_remove(request, slug=None):
log = logging.getLogger('mysite')
user_instance = get_object_or_404(CustomUser, user=request.user)
tag = Tag.get_object_or_404(Tag, slug = slug)
log.info(tag)
if slug:
user_instance.tags.remove(tag)
save_m2m()
return redirect('student_page') """
@login_required
def tag_list(request):
log = logging.getLogger('mysite')