configured django-cms for testing purposes

diff --git a/auth/manifoldbackend.py b/auth/manifoldbackend.py
index f763291..a4aed0d 100644 (file)
--- a/auth/manifoldbackend.py
+++ b/auth/manifoldbackend.py
@@ -34,15 +34,11 @@ class ManifoldBackend:
 #old            expires = time.time() + (24 * 60 * 60)
 
             sessions_result = api.forward(Query.create('local:session').to_dict())
 #old            expires = time.time() + (24 * 60 * 60)
 
             sessions_result = api.forward(Query.create('local:session').to_dict())

-            print "result"

             sessions = sessions_result.ok_value()
             sessions = sessions_result.ok_value()

-            print "ok"

             if not sessions:
                 print "GetSession failed", sessions_result.error()
                 return
             if not sessions:
                 print "GetSession failed", sessions_result.error()
                 return

-            print "first", sessions

             session = sessions[0]
             session = sessions[0]

-            print "SESSION=", session

 
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session['session']}
 
             # Change to session authentication
             api.auth = {'AuthMethod': 'session', 'session': session['session']}


@@ -56,7 +52,6 @@ class ManifoldBackend:
                 print "GetPersons failed",persons_result.error()
                 return
             person = persons[0]
                 print "GetPersons failed",persons_result.error()
                 return
             person = persons[0]

-            print "PERSON=", person

 
             request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
         except Exception, e:
 
             request.session['manifold'] = {'auth': api.auth, 'person': person, 'expires': session['expires']}
         except Exception, e:

diff --git a/myslice/settings.py b/myslice/settings.py
index 746ecbc..6d95b9a 100644 (file)
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -29,7 +29,7 @@ if not ROOT:
 
 ####################
 ADMINS = (
 
 ####################
 ADMINS = (

-    # ('your_name', 'your_email@test.com'),
+    ('admin', 'your_email@test.com'),

 )
 
 MANAGERS = ADMINS
 )
 
 MANAGERS = ADMINS


@@ -42,10 +42,6 @@ EMAIL_HOST = "localhost"
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False
 
 EMAIL_PORT = 25
 EMAIL_USE_TLS = False
 

-
-
-
-

 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'.


@@ -134,11 +130,14 @@ MIDDLEWARE_CLASSES = (
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 
     # Uncomment the next line for simple clickjacking protection:
     # 'django.middleware.clickjacking.XFrameOptionsMiddleware',
 

+    'django.middleware.locale.LocaleMiddleware',
+    'django.middleware.doc.XViewMiddleware',
+

     # CMS
     # CMS

-    'cms.middleware.multilingual.MultilingualURLMiddleware',

     'cms.middleware.page.CurrentPageMiddleware',
     'cms.middleware.user.CurrentUserMiddleware',
     'cms.middleware.toolbar.ToolbarMiddleware',
     'cms.middleware.page.CurrentPageMiddleware',
     'cms.middleware.user.CurrentUserMiddleware',
     'cms.middleware.toolbar.ToolbarMiddleware',

+    'cms.middleware.language.LanguageCookieMiddleware',

 )
 
 # CMS
 )
 
 # CMS


@@ -173,6 +172,7 @@ CMS_TEMPLATES = (
     ('template_1.html', 'Template One'),
     ('template_2.html', 'Template Two'),
 )
     ('template_1.html', 'Template One'),
     ('template_2.html', 'Template Two'),
 )

+

 LANGUAGES = [
     ('en', 'English'),
 ]
 LANGUAGES = [
     ('en', 'English'),
 ]


@@ -217,7 +217,7 @@ INSTALLED_APPS = (
     'sekizai', # for javascript and css management
     # + plugins:
     'cms.plugins.flash',
     'sekizai', # for javascript and css management
     # + plugins:
     'cms.plugins.flash',

-    'cms.plugins.googlemap'
+    'cms.plugins.googlemap',

     'cms.plugins.link',
     'cms.plugins.snippet',
     'cms.plugins.text',
     'cms.plugins.link',
     'cms.plugins.snippet',
     'cms.plugins.text',


@@ -236,7 +236,7 @@ INSTALLED_APPS = (
     #'cmsplugin_filer_video',
 
     # Versioning of content 
     #'cmsplugin_filer_video',
 
     # Versioning of content 

-    'reversion',
+    #'reversion',

 )
 
 ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.
 )
 
 ACCOUNT_ACTIVATION_DAYS = 7 # One-week activation window; you may, of course, use a different value.


@@ -270,7 +270,12 @@ LOGGING = {
     }
 }
 
     }
 }
 

-AUTHENTICATION_BACKENDS = ( 'auth.backend.MyCustomBackend', 'auth.manifoldbackend.ManifoldBackend', )
+AUTHENTICATION_BACKENDS = (
+    'auth.backend.MyCustomBackend',
+    'auth.manifoldbackend.ManifoldBackend', 
+    # This is required to login as an admin
+    'django.contrib.auth.backends.ModelBackend' 
+)

 
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine
 
 ### the view to redirect malformed (i.e. with a wrong CSRF) incoming requests
 # without this setting django will return a 403 forbidden error, which is fine

diff --git a/myslice/urls.py b/myslice/urls.py
index b37ee50..fc6fa54 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -1,8 +1,10 @@
 from django.conf.urls import patterns, include, url
 from django.conf.urls import patterns, include, url

+from django.conf.urls.i18n import i18n_patterns
+from django.conf import settings

 
 # Uncomment the next two lines to enable the admin:
 
 # Uncomment the next two lines to enable the admin:

-# from django.contrib import admin
-# admin.autodiscover()
+from django.contrib import admin
+admin.autodiscover()

 
 # to enable insert_above stuff
 from django.template.loader import add_to_builtins
 
 # to enable insert_above stuff
 from django.template.loader import add_to_builtins


@@ -14,6 +16,7 @@ default_view='trash.pluginview.test_plugin_view'
 after_login_view='trash.dashboard.dashboard_view'
 
 urlpatterns = patterns(
 after_login_view='trash.dashboard.dashboard_view'
 
 urlpatterns = patterns(

+#urlpatterns = i18n_patterns(

     '',
     # Examples:
     # url(r'^$', 'myslice.views.home', name='home'),
     '',
     # Examples:
     # url(r'^$', 'myslice.views.home', name='home'),


@@ -21,11 +24,12 @@ urlpatterns = patterns(
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:
     # Uncomment the admin/doc line below to enable admin documentation:
     # url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Uncomment the next line to enable the admin:

-    # url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', include(admin.site.urls)),
+

     #
     # default / view
     #
     #
     # default / view
     #

-    (r'^/?$', default_view),
+    #(r'^/?$', default_view),

     #
     # login / logout
     #
     #
     # login / logout
     #


@@ -52,4 +56,13 @@ urlpatterns = patterns(
     # Debug
     url(r'^debug/', include('debug_platform.urls')),
 
     # Debug
     url(r'^debug/', include('debug_platform.urls')),
 

+    url(r'^', include('cms.urls')),

 )
 )

+
+# CMS
+if settings.DEBUG:
+    urlpatterns = patterns('',
+    url(r'^media/(?P<path>.*)$', 'django.views.static.serve',
+        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'', include('django.contrib.staticfiles.urls')),
+) + urlpatterns