From a74327e1f2f5577d241782e9cd169bbefbeb9372 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 16 Aug 2017 18:42:41 +0200 Subject: [PATCH] Fix urls against PR #184 --- telemeta/urls.py | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/telemeta/urls.py b/telemeta/urls.py index 03600963..d047f972 100644 --- a/telemeta/urls.py +++ b/telemeta/urls.py @@ -146,8 +146,13 @@ urlpatterns = patterns('', url(r'^admin/$', admin_view.admin_index, name="telemeta-admin"), url(r'^admin/general/$', admin_view.admin_general, name="telemeta-admin-general"), url(r'^admin/enumerations/$', admin_view.admin_enumerations, name="telemeta-admin-enumerations"), + url(r'^admin/enumerations/update/$', admin_view.set_admin_enumeration, name="telemeta-admin-enumerations-update"), url(r'^admin/users/$', admin_view.admin_users, name="telemeta-admin-users"), + # instruments + url(r'^instruments/$', instrument_view.instrument_list, name="telemeta-instruments"), + + # instruments administration url(r'^admin/instruments/$', instrument_view.edit_instrument , name="telemeta-instrument-edit"), url(r'^admin/instruments/add/$', instrument_view.add_to_instrument, name="telemeta-instrument-add"), @@ -160,6 +165,9 @@ urlpatterns = patterns('', url(r'^admin/instruments/' + r'(?P[0-9]+)/update/$', instrument_view.update_instrument_value, name="telemeta-instrument-record-update"), url(r'^admin/instruments/' + r'(?P[0-9]+)/replace/$', instrument_view.replace_instrument_value, name="telemeta-instrument-record-replace"), + # instruments aliases + url(r'^instruments_alias/$', instrument_alias_view.instrument_list, name="telemeta-instrument-alias"), + # instruments aliases administration url(r'^admin/instrument_aliases/$', instrument_alias_view.edit_instrument, name="telemeta-instrument-alias-edit"), url(r'^admin/instrument_aliases/add/$', instrument_alias_view.add_to_instrument, name="telemeta-instrument-alias-add"), @@ -171,14 +179,34 @@ urlpatterns = patterns('', url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-item-unpublished/$', ItemAliasUnpublishedListView.as_view(),name="telemeta-items-alias-unpublished"), url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-item-sound/$', ItemAliasSoundListView.as_view(),name="telemeta-items-alias-sound"), url(r'^admin/instrument_aliases/' + r'(?P[0-9]+)/'+'list-items/$', ItemAliasListView.as_view(), name="telemeta-alias-item-list"), - + # enumeration + url(r'^enumerations/$',enumeration_view.enumerations,name="telemeta-enumerations"), + url(r'^enumerations/(?P[0-9a-z]+)/$', enumeration_view.enumeration, name="telemeta-enumeration"), # enumerations administration - url(r'^admin/enumerations/(?P[0-9a-z]+)/$', admin_view.edit_enumeration , name="telemeta-enumeration-edit"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/add/$', admin_view.add_to_enumeration, name="telemeta-enumeration-add"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/update/$', admin_view.update_enumeration, name="telemeta-enumeration-update"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/$', admin_view.edit_enumeration_value, name="telemeta-enumeration-record-edit"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/update/$', admin_view.update_enumeration_value, name="telemeta-enumeration-record-update"), - url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/replace/$', admin_view.replace_enumeration_value, name="telemeta-enumeration-replace"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/$',admin_view.edit_enumeration,name="telemeta-enumeration-edit"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/add/$',admin_view.add_to_enumeration,name="telemeta-enumeration-add"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/update/$', admin_view.update_enumeration,name="telemeta-enumeration-update"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/$',admin_view.edit_enumeration_value, name="telemeta-enumeration-record-edit"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/update/$',admin_view.update_enumeration_value, name="telemeta-enumeration-record-update"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/replace/$',admin_view.replace_enumeration_value, name="telemeta-enumeration-replace"), + + # Enumeration list collection + url( r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/collection/list/$',CollectionEnumListView.as_view(), name="telemeta-enumeration-list-collection"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/collections_unpublished/list/$',CollectionUnpublishedEnumListView.as_view(),name="telemeta-enumeration-list-collections-unpublished"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/collections_published/list/$',CollectionPublishedEnumListView.as_view(),name="telemeta-enumeration-list-collections-published"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/collections_sound/list/$',CollectionSoundEnumListView.as_view(), name="telemeta-enumeration-list-collections-sound"), + + # Enumeration list item + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/item/list/$',ItemEnumListView.as_view(), name="telemeta-enumeration-list-item"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/item_unpublished/list/$',ItemUnpublishedEnumListView.as_view(), name="telemeta-enumeration-list-item-unpublished"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/item_published/list/$',ItemPublishedEnumListView.as_view(), name="telemeta-enumeration-list-item-published"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/item_sound/list/$',ItemSoundEnumListView.as_view(), name="telemeta-enumeration-list-item-sound"), + + # keyword list + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/keyword_item/list/$',ItemKeywordListView.as_view(), name="telemeta-keyword-list-item"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/keyword_item_unpublished/list/$',ItemKeywordPublishedListView.as_view(), name="telemeta-keyword-list-item-unpublished"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/keyword_item_published/list/$',ItemKeywordUnpublishedListView.as_view(), name="telemeta-keyword-list-item-published"), + url(r'^admin/enumerations/(?P[0-9a-z]+)/' + r'(?P[0-9]+)/keyword_item_sound/list/$',ItemKeywordSoundListView.as_view(), name="telemeta-keyword-list-item-sound"), # Geographic browsing url(r'^geo/$', geo_view.list_continents, name="telemeta-geo-continents"), @@ -241,7 +269,7 @@ urlpatterns = patterns('', # Timeside #url(r'^timeside/', include('timeside.server.urls')), -) + ) if settings.DEBUG and 'debug_toolbar' in settings.INSTALLED_APPS: -- 2.39.5