Use hasattr instead of checking for django version number to check
authorDiane Trout <diane@caltech.edu>
Wed, 19 Aug 2009 23:50:30 +0000 (23:50 +0000)
committerDiane Trout <diane@caltech.edu>
Wed, 19 Aug 2009 23:50:30 +0000 (23:50 +0000)
for the new admin.site.urls (django 1.1 compatibility)

htsworkflow/frontend/urls.py

index d08a75d66fdfdcebbbad8dd3573f594fe8009c05..b0423bdbfd1c7eca65871092249886ebcc20c89c 100644 (file)
@@ -54,14 +54,10 @@ urlpatterns = patterns('',
 )
 
 # Allow admin
-if django.VERSION >= (1, 1, 0, 'final', 0):
-  urlpatterns += patterns('',
-    (r'^admin/', include(admin.site.urls)),
-  )
-else:
-  urlpatterns += patterns('',
-    (r'^admin/(.*)', admin.site.root),
-  )
+if hasattr(admin.site, 'urls'):
+  urlpatterns += patterns('', (r'^admin/', include(admin.site.urls)))
+else:                          
+  urlpatterns += patterns('', (r'^admin/(.*)', admin.site.root))
 
 if settings.DEBUG:
   urlpatterns += patterns('',