diff -r 7040f6533c42 -r ea6268cf8c83 src/hdalab/urls.py --- a/src/hdalab/urls.py Wed Sep 03 17:22:23 2014 +0200 +++ b/src/hdalab/urls.py Fri Sep 05 12:43:52 2014 +0200 @@ -2,10 +2,12 @@ from django.conf.urls import patterns, include, url from django.views.generic import TemplateView from hdalab.views.profile import ProfileHome, RenkanEdit, HdalabRenkanGetPut,\ - RenkanNew, RenkanPublicList, HdalabRenkanCopy, HdalabRenkanDelete + RenkanNew, RenkanPublicList, HdalabRenkanCopy, HdalabRenkanDelete,\ + HdalabRenkanModerate from django.contrib.auth.decorators import login_required +from django.contrib.admin.views.decorators import staff_member_required from hdalab.views.editorial import HdalabFolders, HdalabAddOrUpdateFolder,\ - HdalabDeleteFolder + HdalabDeleteFolder, ManageRenkans # Uncomment the next two lines to enable the admin: # from django.contrib import admin @@ -40,14 +42,17 @@ url(r'^renkan/view/$', TemplateView.as_view(template_name="renkan_view.html"), name='renkan_view'), url(r'^renkan/copy/(?P.*)$', login_required(HdalabRenkanCopy.as_view()), name='renkan_copy'), url(r'^renkan/delete/(?P.*)$', login_required(HdalabRenkanDelete.as_view()), name='renkan_delete'), + url(r'^renkan/moderate/(?P.*)/(?P.*)$', login_required(HdalabRenkanModerate.as_view()), name='renkan_moderate'), url(r'^profile/$', login_required(ProfileHome.as_view()), name='profile_home'), url(r'^renkan/public/$', RenkanPublicList.as_view(), name='renkan_public_list'), url(r'^ajaxlogin/$', "hdalab.views.profile.ajax_login", name='ajax_login'), url(r'^ajaxloginok/$', TemplateView.as_view(template_name="ajax_identification/ajax_login_ok.html"), name='ajax_login_ok'), - url(r'^edito/folders/$', login_required(HdalabFolders.as_view()), name='hdalab_folders'), - url(r'^edito/folder/$', login_required(HdalabAddOrUpdateFolder.as_view()), name='hdalab_add_or_update_folder'), - url(r'^edito/folder/(?P[\w-]+)$', login_required(HdalabAddOrUpdateFolder.as_view()), name='hdalab_add_or_update_folder'), - url(r'^edito/deletefolder/(?P[\w-]+)$', login_required(HdalabDeleteFolder.as_view()), name='hdalab_delete_folder'), + url(r'^edito/$', staff_member_required(TemplateView.as_view(template_name="editorial/edito_home.html")), name='edito_home'), + url(r'^edito/manage/$', staff_member_required(ManageRenkans.as_view()), name='manage_renkans'), + url(r'^edito/folders/$', staff_member_required(HdalabFolders.as_view()), name='hdalab_folders'), + url(r'^edito/folder/$', staff_member_required(HdalabAddOrUpdateFolder.as_view()), name='hdalab_add_or_update_folder'), + url(r'^edito/folder/(?P[\w-]+)$', staff_member_required(HdalabAddOrUpdateFolder.as_view()), name='hdalab_add_or_update_folder'), + url(r'^edito/deletefolder/(?P[\w-]+)$', staff_member_required(HdalabDeleteFolder.as_view()), name='hdalab_delete_folder'), )