urls: reorder urls
This commit is contained in:
parent
eac52c2c46
commit
225df4501e
|
@ -2,12 +2,6 @@
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import compte_agglo_montpellier
|
|
||||||
|
|
||||||
sys.path.append(os.path.join(
|
|
||||||
os.path.dirname(compte_agglo_montpellier.__file__),
|
|
||||||
'apps'))
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "compte_agglo_montpellier.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "compte_agglo_montpellier.settings")
|
||||||
os.environ.setdefault('DEBUG', '1')
|
os.environ.setdefault('DEBUG', '1')
|
||||||
|
|
|
@ -172,7 +172,6 @@ INSTALLED_APPS = (
|
||||||
'authentic2.auth2_auth',
|
'authentic2.auth2_auth',
|
||||||
'authentic2.attribute_aggregator',
|
'authentic2.attribute_aggregator',
|
||||||
'authentic2.disco_service',
|
'authentic2.disco_service',
|
||||||
'wcsinst.wcsinst',
|
|
||||||
'portail_citoyen_announces',
|
'portail_citoyen_announces',
|
||||||
'portail_citoyen',
|
'portail_citoyen',
|
||||||
'wcsinst.wcsinst',
|
'wcsinst.wcsinst',
|
||||||
|
|
|
@ -16,9 +16,10 @@ cms.cms_toolbar.CMSToolbar._request_hook_get = __django_cms_tollbar_request_hook
|
||||||
urlpatterns = patterns('',
|
urlpatterns = patterns('',
|
||||||
url('^announces/', include('portail_citoyen_announces.urls')),
|
url('^announces/', include('portail_citoyen_announces.urls')),
|
||||||
)
|
)
|
||||||
urlpatterns += pc_urls
|
|
||||||
|
|
||||||
urlpatterns += patterns('',
|
urlpatterns += patterns('',
|
||||||
url(r'^captcha/', include('captcha.urls')),
|
url(r'^captcha/', include('captcha.urls')),
|
||||||
url(r'^cms-ajax-text-plugin/', include('cms_ajax_text_plugin.urls')),
|
url(r'^cms-ajax-text-plugin/', include('cms_ajax_text_plugin.urls')),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
urlpatterns += pc_urls
|
||||||
|
|
|
@ -22,10 +22,6 @@ import sys
|
||||||
# os.environ["DJANGO_SETTINGS_MODULE"] = "compte_agglo_montpellier.settings"
|
# os.environ["DJANGO_SETTINGS_MODULE"] = "compte_agglo_montpellier.settings"
|
||||||
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "compte_agglo_montpellier.settings")
|
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "compte_agglo_montpellier.settings")
|
||||||
|
|
||||||
apps_path = os.path.join(os.path.dirname(__file__), 'apps')
|
|
||||||
if apps_path not in sys.path:
|
|
||||||
sys.path.append(apps_path)
|
|
||||||
|
|
||||||
# This application object is used by any WSGI server configured to use this
|
# This application object is used by any WSGI server configured to use this
|
||||||
# file. This includes Django's development server, if the WSGI_APPLICATION
|
# file. This includes Django's development server, if the WSGI_APPLICATION
|
||||||
# setting points here.
|
# setting points here.
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -25,7 +25,7 @@ class compile_translations(Command):
|
||||||
try:
|
try:
|
||||||
from django.core.management.commands.compilemessages import \
|
from django.core.management.commands.compilemessages import \
|
||||||
compile_messages
|
compile_messages
|
||||||
for path in ['compte_agglo_montpellier'] + glob.glob('compte_agglo_montpellier/apps/*'):
|
for path in ['compte_agglo_montpellier']:
|
||||||
if not os.path.exists(os.path.join(path, 'locale')):
|
if not os.path.exists(os.path.join(path, 'locale')):
|
||||||
continue
|
continue
|
||||||
curdir = os.getcwd()
|
curdir = os.getcwd()
|
||||||
|
|
Reference in New Issue