Adnane Belmadiaf has proposed merging lp:~daker/loco-directory/ltp-django1.3
into lp:loco-directory.
Requested reviews:
LoCo Team Portal Developers (loco-directory-dev)
For more details, see:
https://code.launchpad.net/~daker/loco-directory/ltp-django1.3/+merge/81638
--
https://code.launchpad.net/~daker/loco-directory/ltp-django1.3/+merge/81638
Your team LoCo Team Portal Developers is requested to review the proposed merge
of lp:~daker/loco-directory/ltp-django1.3 into lp:loco-directory.
=== modified file 'loco_directory/local_settings.py.sample'
--- loco_directory/local_settings.py.sample 2010-07-30 16:14:42 +0000
+++ loco_directory/local_settings.py.sample 2011-11-08 20:40:54 +0000
@@ -1,7 +1,13 @@
-DATABASE_ENGINE = 'sqlite3' # Change to postgresql_psycopg2 for postgres
-DATABASE_NAME = 'loco_directory.db' # sqlite3 file or database name
-#DATABASE_USER = ''
-#DATABASE_PASSWORD = ''
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': 'loco_directory.db',
+ 'USER': '',
+ 'PASSWORD': '',
+ 'HOST': '',
+ 'PORT': '',
+ },
+}
SECRET_KEY = ''
=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py 2011-10-10 20:49:41 +0000
+++ loco_directory/settings.py 2011-11-08 20:40:54 +0000
@@ -17,6 +17,10 @@
modules = {
'pytz': 'python-tz',
'vobject': 'python-vobject',
+ 'south': 'python-django-south',
+ 'django_openid_auth': 'python-django-openid-auth',
+ 'feedparser': 'python-feedparser',
+ 'gettext': 'python-gettext'
}
for module,package in modules.items():
@@ -47,8 +51,16 @@
MANAGERS = ADMINS
LP_PROJECT_NAME = 'loco-directory'
-DATABASE_ENGINE = 'sqlite3'
-DATABASE_NAME = 'loco_directory.db'
+DATABASES = {
+ 'default': {
+ 'ENGINE': 'django.db.backends.sqlite3',
+ 'NAME': 'loco_directory.db',
+ #'USER': '',
+ #'PASSWORD': '',
+ #'HOST': 'localhost',
+ #'PORT': '',
+ },
+}
# Local time zone for this installation. Choices can be found here:
# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -86,8 +98,8 @@
# List of callables that know how to import templates from various sources.
TEMPLATE_LOADERS = (
- 'django.template.loaders.filesystem.load_template_source',
- 'django.template.loaders.app_directories.load_template_source',
+ 'django.template.loaders.filesystem.Loader',
+ 'django.template.loaders.app_directories.Loader',
)
MIDDLEWARE_CLASSES = (
@@ -99,7 +111,7 @@
# list with template context processors. see http://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
TEMPLATE_CONTEXT_PROCESSORS = (
- "django.core.context_processors.auth",
+ "django.contrib.auth.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
=== modified file 'loco_directory/urls.py'
--- loco_directory/urls.py 2011-10-11 14:03:43 +0000
+++ loco_directory/urls.py 2011-11-08 20:40:54 +0000
@@ -15,7 +15,6 @@
url(r'^about-loco/setup/$', 'common.views.loco_setup', name='loco_setup'),
url(r'^about-loco/$', 'common.views.about_loco', name='about_loco'),
url(r'^using-locodir/$', 'common.views.using_locodir', name='using_locodir'),
- url(r'^admin/(.*)', admin.site.root),
url(r'^data/xml', 'teams.views.xml_team_data', name='xml_team_data'),
url(r'^teams/', include('teams.urls')),
url(r'^events/venues/', include('venues.urls')),
@@ -27,13 +26,12 @@
url(r'^jsi18n', 'django.views.i18n.javascript_catalog', name='jsi18n'),
url(r'^services/', include('services.urls')),
url(r'^search/', 'common.views.site_search', name='site_search'),
+ (r'^admin/', include(admin.site.urls)),
)
urlpatterns += patterns('django_openid_auth.views',
- url(r'^openid/login/$', 'login_begin', name='openid-login',
- kwargs={'render_failure': login_failure}),
- url(r'^openid/complete/$', 'login_complete', name='openid-complete',
- kwargs={'render_failure': login_failure}),
+ url(r'^openid/login/$', 'login_begin', name='openid-login'),
+ url(r'^openid/complete/$', 'login_complete', name='openid-complete',),
url(r'^openid/logo.gif$', 'logo', name='openid-logo'),
)
_______________________________________________
Mailing list: https://launchpad.net/~loco-directory-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~loco-directory-dev
More help : https://help.launchpad.net/ListHelp
