+ a logfile is now being written when something is edited or deleted
+ new logo (by Phyyyl)
This commit is contained in:
Clemens-Dautermann 2018-12-28 21:58:09 +01:00
parent 721a2d5210
commit 4a710bafde
10 changed files with 33 additions and 2 deletions

View file

@ -125,3 +125,5 @@ LOGIN_REDIRECT_URL = '/'
LOGIN_URL = '/accounts/login'
EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
LOGFILE = 'serverlog.log'

View file

@ -1,5 +1,7 @@
from django.shortcuts import render
from django.contrib.auth.decorators import login_required
from django.conf import settings
from os.path import join
from .forms import ObjectForm, CategoryForm
from django.utils import timezone
@ -24,6 +26,12 @@ def add(request):
obj.user_added = request.user
obj.save()
log = open(settings.LOGFILE, 'a')
log.write(
'\n[' + str(timezone.now()) + ']' + ' CREATE_OBJECT ' + '|USR: ' + request.user.username + '|NAME: ' +
form.cleaned_data['title'] + '|UUID: ' + str(obj.uuid) + '|CAT: ' + str(obj.category)
)
context = {'title': 'Objekt inventarisieren', 'form': ObjectForm,
'obj_name': form.cleaned_data.get('title')}
return render(request, 'object_adder/index.html', context)
@ -42,6 +50,12 @@ def category(request):
cat = form.save()
cat.save()
log = open(settings.LOGFILE, 'a')
log.write(
'\n[' + str(timezone.now()) + ']' + ' CREATE_CATEGORY ' + '|USR: ' + request.user.username + '|NAME: ' +
cat.name + '|UUID: ' + str(cat.id)
)
context = {'title': 'Neue Kategorie hinzufügen',
'cat_name': form.cleaned_data.get('name'),
'form': CategoryForm}

View file

@ -3,6 +3,7 @@ from object_adder.models import Object, Category
from object_adder.forms import ObjectForm
from django.contrib.auth.decorators import login_required
from django.utils import timezone
from django.conf import settings
import re
@ -80,11 +81,22 @@ def delete(request, uuid_url):
obj = get_object_or_404(Object, pk=uuid_url)
obj.removed_date = timezone.now()
obj.save()
log = open(settings.LOGFILE, 'a')
log.write(
'\n[' + str(timezone.now()) + ']' + ' REMOVE_OBJECT ' + '|USR: ' + request.user.username + '|NAME: ' +
obj.title + '|UUID: ' + str(obj.uuid) + '|CAT: ' + str(obj.category)
)
return render(request, 'object_lister/delete.html', {'uuid': uuid_url})
@login_required
def deleteCategory(request, uuid_url):
cat = get_object_or_404(Category, pk=uuid_url)
log = open(settings.LOGFILE, 'a')
log.write(
'\n[' + str(timezone.now()) + ']' + ' REMOVE_CATEGORY ' + '|USR: ' + request.user.username + '|NAME: ' +
cat.name + '|UUID: ' + str(cat.id)
)
cat.delete()
return render(request, 'object_lister/delete.html', {'uuid': uuid_url})

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 105 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 MiB

View file

@ -24,13 +24,13 @@
{% if user.is_authenticated %}
<div class="navbar-header">
<img src="{% static 'user_manager/images/logo_50_50.png' %}" class="logo">
<img src="{% static 'user_manager/images/logo.png' %}" class="logo">
</div>
<span class="welcome">Wilkommen {{ user.username }}!</span>
{% else %}
<div class="navbar-header">
<img src="{% static 'user_manager/images/logo_50_50.png' %}" class="logo_not_logged_in">
<img src="{% static 'user_manager/images/logo.png' %}" class="logo_not_logged_in">
</div>
{% endif %}
<ul class="nav navbar-nav">