# HG changeset patch # User cavaliet # Date 1403099932 -7200 # Node ID 503a520308543f7707a31985eb6746cde773da1d # Parent f473bed524cd8fbe27f85eff699dc0016abd673f delete folder feature diff -r f473bed524cd -r 503a52030854 src/hdabo/templates/folders.html --- a/src/hdabo/templates/folders.html Wed Jun 18 13:26:02 2014 +0200 +++ b/src/hdabo/templates/folders.html Wed Jun 18 15:58:52 2014 +0200 @@ -21,7 +21,7 @@ {{f.description}} - + {% endfor %} diff -r f473bed524cd -r 503a52030854 src/hdabo/urls.py --- a/src/hdabo/urls.py Wed Jun 18 13:26:02 2014 +0200 +++ b/src/hdabo/urls.py Wed Jun 18 15:58:52 2014 +0200 @@ -1,7 +1,8 @@ from django.conf.urls import patterns, include, url from django.contrib import admin from django.contrib.auth import urls as auth_url -from .views import AddOrUpdateFolder, Folders, SearchDatasheet +from django.contrib.auth.decorators import login_required +from .views import AddOrUpdateFolder, Folders, SearchDatasheet, DeleteFolder # Uncomment the next two lines to enable the admin: @@ -46,8 +47,9 @@ url(r'^updatetagalias$', 'hdabo.views.update_tag_alias'), url(r'^updatetagcategory$', 'hdabo.views.update_tag_category'), url(r'^ordertagsdatasheet$', 'hdabo.views.reorder_tag_datasheet'), - url(r'^folders/$', Folders.as_view(), name='folders'), - url(r'^folder/$', AddOrUpdateFolder.as_view(), name='add_or_update_folder'), - url(r'^folder/(?P[\w-]+)$', AddOrUpdateFolder.as_view(), name='add_or_update_folder'), - url(r'^searchajax/$', SearchDatasheet(), name='searchajax'), + url(r'^folders/$', login_required(Folders.as_view()), name='folders'), + url(r'^folder/$', login_required(AddOrUpdateFolder.as_view()), name='add_or_update_folder'), + url(r'^folder/(?P[\w-]+)$', login_required(AddOrUpdateFolder.as_view()), name='add_or_update_folder'), + url(r'^searchajax/$', login_required(SearchDatasheet()), name='searchajax'), + url(r'^deletefolder/(?P[\w-]+)$', login_required(DeleteFolder.as_view()), name='delete_folder'), ) diff -r f473bed524cd -r 503a52030854 src/hdabo/views.py --- a/src/hdabo/views.py Wed Jun 18 13:26:02 2014 +0200 +++ b/src/hdabo/views.py Wed Jun 18 15:58:52 2014 +0200 @@ -632,4 +632,16 @@ +class DeleteFolder(View): + + def get(self, request, folder_pk=None): + folder = None + if folder_pk: + folder = get_object_or_404(Folder, pk=folder_pk) + folder.delete() + + return redirect('folders') + + +