From 20f84d3a97a839da08f9e8616984e41b65af9a45 Mon Sep 17 00:00:00 2001 From: Kostas Papadimitriou Date: Tue, 10 Jul 2012 14:04:12 +0300 Subject: [PATCH] Late append of cms urls since cms includes generic url pattern for /*, to avoid conflict with other apps urls. --- cloudcms/urls.py | 2 ++ setup.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cloudcms/urls.py b/cloudcms/urls.py index 1cfee9e..c0cdfdd 100644 --- a/cloudcms/urls.py +++ b/cloudcms/urls.py @@ -51,3 +51,5 @@ urlpatterns = patterns('', url(r'^sitemap\.xml$', 'django.contrib.sitemaps.views.sitemap', {'sitemaps': sitemaps }), ) +synnefo_urls = (1000, urlpatterns) + diff --git a/setup.py b/setup.py index fdd880f..df926d0 100644 --- a/setup.py +++ b/setup.py @@ -54,7 +54,7 @@ VERSION = __version__ INSTALL_REQUIRES = [ - 'snf-common>=0.9.0', + 'snf-common>0.9.13', 'Django >=1.2.3, <1.3', 'South>=0.7', 'feincms >=1.4.2, <1.4.9', @@ -177,7 +177,7 @@ setup( 'web_apps = cloudcms.synnefo_settings:cloudcms_apps', 'web_middleware = cloudcms.synnefo_settings:cloudcms_middlewares', 'web_context_processors = cloudcms.synnefo_settings:cloudcms_context_processors', - 'urls = cloudcms.urls:urlpatterns', + 'urls = cloudcms.urls:synnefo_urls', 'web_static = cloudcms.synnefo_settings:cloudcms_staticfiles' ] }, -- 1.7.10.4