clara/Inventarium
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Bugfixes

Browse source 
+ delete categories
+ translations
+ style improvements
This commit is contained in:
Clemens-Dautermann 2018-12-27 13:40:49 +01:00
parent 51c942746b
commit a4486909df
14 changed files with 151 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
invsystem/object_lister/urls.py
View file

@ -5,5 +5,6 @@ import uuid
urlpatterns = [
path('', views.objlist, name='objlist'),
path('<str:orderstr>', views.objlist, name='objlist_ordered'),
path('<str:uuid_url>/delete', views.delete, name='del_obj')
path('<str:uuid_url>/delete', views.delete, name='del_obj'),
path('<str:uuid_url>/delete/category', views.deleteCategory, name='del_cat')
]

9
invsystem/object_lister/views.py
View file

@ -48,7 +48,7 @@ def objlist(request, orderstr=None):
return render(request, 'object_lister/index.html', context)
elif request.method == 'POST':
form = ObjectForm(request.POST)
form = ObjectForm(request.POST, request.FILES)
if form.is_valid():
result = re.fullmatch(uuidv4pattern, orderstr)
@ -78,3 +78,10 @@ def delete(request, uuid_url):
obj = get_object_or_404(Object, pk=uuid_url)
obj.delete()
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)
cat.delete()
return render(request, 'object_lister/delete.html', {'uuid': uuid_url})