diff options
| -rw-r--r-- | chimere/admin.py | 7 | ||||
| -rw-r--r-- | chimere/urls.py | 103 | ||||
| -rw-r--r-- | chimere_example_project/urls.py | 30 |
3 files changed, 71 insertions, 69 deletions
diff --git a/chimere/admin.py b/chimere/admin.py index 99ef31e..ba1197f 100644 --- a/chimere/admin.py +++ b/chimere/admin.py @@ -365,16 +365,15 @@ class MarkerAdmin(admin.ModelAdmin): self, request, Marker.objects.filter(pk=item_id)) def get_urls(self): - from django.conf.urls import patterns, url + from django.conf.urls import url urls = super(MarkerAdmin, self).get_urls() model_name = self.model.__name__.lower() - my_urls = patterns( - '', + my_urls = [ url(r'^admin-{}-modification/(?P<item_id>\d+)/$'.format( model_name), self.admin_site.admin_view(self.admin_modification), name='admin-{}-modification'.format(model_name)), - ) + ] return my_urls + urls def get_form(self, request, obj=None, **kwargs): diff --git a/chimere/urls.py b/chimere/urls.py index 60a223b..89c1070 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -18,11 +18,12 @@ # See the file COPYING for details. from django.conf import settings -from django.conf.urls import patterns, url +from django.conf.urls import url from django.contrib import admin from django.core.exceptions import ImproperlyConfigured admin.autodiscover() +from chimere import views from chimere.views import CategoryDirectoryView, CategoryView from chimere.feeds import LatestPOIsByCategory, LatestPOIsBySubCategory, \ LatestPOIs, LatestPOIsByZone, LatestPOIsByZoneID @@ -32,17 +33,15 @@ def i18n_javascript(request): return admin.site.i18n_javascript(request) -urlpatterns = patterns( - 'chimere.views', - url(r'^status/$', 'status', name='status'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?simple$', 'index', {'simple': True}, - name="simple_index") -) +urlpatterns = [ + url(r'^status/$', views.status, name='status'), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?simple$', views.index, + {'simple': True}, name="simple_index") +] if settings.CHIMERE_FEEDS: - urlpatterns += patterns( - '', - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds$', 'chimere.views.rss', + urlpatterns += [ + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds$', views.rss, name='feeds-form'), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/category/' r'(?P<category_id>\d+)$', @@ -56,7 +55,7 @@ if settings.CHIMERE_FEEDS: LatestPOIsByZone(), name='feeds-area'), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?feeds/areaid/(?P<area_id>\d+)$', LatestPOIsByZoneID(), name='feeds-areaid'), - ) + ] if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ and settings.CHIMERE_ENABLE_ROUTING: @@ -64,8 +63,7 @@ if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ or not settings.CHIMERE_ROUTING_TRANSPORT: raise ImproperlyConfigured(u"CHIMERE_ROUTING_TRANSPORT must be set in" u" settings if you enable routing") - urlpatterns += patterns( - 'chimere.views', + urlpatterns += [ url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?route/' r'(?P<transport>(%s))/((?P<speed>[0-9][0-9]*)/)?' r'(?P<lon1>[-]?[0-9]+[.]?[0-9]*)_(?P<lat1>[-]?[0-9]+[.]?[0-9]*)_' @@ -73,79 +71,80 @@ if hasattr(settings, 'CHIMERE_ENABLE_ROUTING') \ r'(?P<lon2>[-]?[0-9]+[.]?[0-9]*)_(?P<lat2>[-]?[0-9]+[.]?[0-9]*)$' % ('|'.join([key for key, lbl in settings.CHIMERE_ROUTING_TRANSPORT])), - 'route', name="route"), - ) + views.route, name="route"), + ] if hasattr(settings, 'CHIMERE_SEARCH_ENGINE') \ and settings.CHIMERE_SEARCH_ENGINE: from chimere.forms import SearchForm from chimere.views import SearchView from haystack.views import search_view_factory - urlpatterns += patterns( - 'chimere.views', + urlpatterns += [ url(r'^search/?$', search_view_factory( view_class=SearchView, template='search/search.html', form_class=SearchForm ), name='haystack_search'), - url(r'^search/autocomplete/$', 'autocomplete', + url(r'^search/autocomplete/$', views.autocomplete, name='autocomplete-search') - ) + ] # urlpatterns += [url(r'^search/', include('haystack.urls')),] -urlpatterns += patterns( - 'chimere.views', +urlpatterns += [ url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?dyn/(?P<page_id>\w+)/$', - 'extraPage', name='extra_page'), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', 'contactus', - name="contact"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', 'edit', + views.extraPage, name='extra_page'), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?contact/?$', + views.contactus, name="contact"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit/$', views.edit, name="edit"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/' - r'(?P<submited>\w+)?$', 'editMarker', name="editmarker"), + r'(?P<submited>\w+)?$', views.editMarker, name="editmarker"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-marker/(?P<item_id>\w+)/' - r'(?P<submited>\w+)?$', 'editMarker', name="editmarker-item"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', 'editRoute', - name="editroute"), + r'(?P<submited>\w+)?$', views.editMarker, + name="editmarker-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/$', + views.editRoute, name="editroute"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/' r'(?P<submited>\w+)?$', - 'editRoute', name="editroute-item"), - url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/$', 'editPolygon', - name="editpolygon"), + views.editRoute, name="editroute-item"), + url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/$', + views.editPolygon, name="editpolygon"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-polygon/(?P<item_id>\w+)/' r'(?P<submited>\w+)?$', - 'editPolygon', name="editpolygon-item"), + views.editPolygon, name="editpolygon-item"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/' r'(?P<key>[a-zA-Z_-]*\d+)/?$', - 'getDetail', name="get_detail"), + views.getDetail, name="get_detail"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/popup/' r'(?P<key>[a-zA-Z_-]*\d+)/?$', - 'getDetail', {'popup': True}, name="get_detail"), + views.getDetail, {'popup': True}, name="get_detail"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDetail/undefined', - 'getDetailUndefined', name="get_detail_undefined"), + views.getDetailUndefined, name="get_detail_undefined"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getDescriptionDetail/' - r'?(?P<category_id>\d+)/?$', 'getDescriptionDetail', + r'?(?P<category_id>\d+)/?$', views.getDescriptionDetail, name="get_description_detail"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getGeoObjects/' r'(?P<category_ids>[a-zA-Z0-9_-]+)(/(?P<status>\w+))?$', - 'getGeoObjects', name="getgeoobjects"), + views.getGeoObjects, name="getgeoobjects"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?get-marker/' - r'(?P<pk>[0-9]+)$', 'getMarker', name="get-marker"), + r'(?P<pk>[0-9]+)$', views.getMarker, name="get-marker"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAvailableCategories/$', - 'get_available_categories', name="get_categories"), + views.get_available_categories, name="get_categories"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getAllCategories/$', - 'get_all_categories', name="get_all_categories"), + views.get_all_categories, name="get_all_categories"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?getCategory/(?P<category_id>\d+)/?$', - 'getCategory', name="get_category"), + views.getCategory, name="get_category"), url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?get-share-url/(?:(?P<network>\w+)/' r'(?:(?P<attrs>[a-zA-Z0-9_;.:-]+))?)?/?$', - 'getShareUrl', name="get-share-url"), + views.getShareUrl, name="get-share-url"), url(r'^(?P<area_name>[a-zA-Z0-9_-]*/)?ty/(?P<tiny_urn>\w+)$', - 'redirectFromTinyURN', name="tiny"), + views.redirectFromTinyURN, name="tiny"), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?upload_file/' - r'((?P<category_id>\w+)/)?$', 'uploadFile', name='upload_file'), + r'((?P<category_id>\w+)/)?$', views.uploadFile, + name='upload_file'), url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?process_route_file/' - r'(?P<file_id>\d+)/$', 'processRouteFile', name='process_route_file'), + r'(?P<file_id>\d+)/$', views.processRouteFile, + name='process_route_file'), url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/$', CategoryDirectoryView.as_view(), name='category-directory'), url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?categories/' @@ -153,11 +152,11 @@ urlpatterns += patterns( CategoryView.as_view(), name='category-directory-detail'), url(r'^(?:(?P<area_name>[a-zA-Z0-9_-]*)/)?property-choices/' r'(?P<property_slug>[a-zA-Z0-9_-]+)/$', - 'property_choice_list', name='property-choices'), -) + views.property_choice_list, name='property-choices'), +] if settings.PROJECT_APP == "chimere_example_project": - urlpatterns += patterns( - # At the end, because it catches large - url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', 'index', name="index"), - ) + urlpatterns += [ + url(r'^(?P<area_name>[a-zA-Z0-9_-]+)?', views.index, + name="index"), + ] diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py index e1809b9..367fa59 100644 --- a/chimere_example_project/urls.py +++ b/chimere_example_project/urls.py @@ -18,27 +18,31 @@ # See the file COPYING for details. from django.conf import settings -from django.conf.urls import patterns, url, include +from django.conf.urls import url, include from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns +from django.views.static import serve + admin.autodiscover() -urlpatterns = patterns( - 'django.views.static', - (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', - {'document_root': settings.MEDIA_ROOT}), -) + +urlpatterns = [] +if settings.DEBUG: + urlpatterns += [ + url(r'^media/(?P<path>.*)$', serve, { + 'document_root': settings.MEDIA_ROOT, + }), + ] if "tinymce" in settings.INSTALLED_APPS: - urlpatterns += patterns( - 'django.views.static', - (r'^tinymce/', include('tinymce.urls')),) + urlpatterns += [ + url(r'^tinymce/', include('tinymce.urls')), + ] urlpatterns += staticfiles_urlpatterns() -urlpatterns += patterns( - '', - (r'^admin/', include(admin.site.urls)), +urlpatterns += [ + url(r'^admin/', include(admin.site.urls)), url(r'^', include('chimere.urls', namespace="chimere")), -) +] |