# HG changeset patch # User cavaliet # Date 1325086548 -3600 # Node ID cd00dd7352cd2cafb97a09da4e73097b026ee7e2 # Parent 53cbef6ffd6a0e0def52e0e28573afabd297f9eb Commit with LDT package 00.21 and Django Guardian. diff -r 53cbef6ffd6a -r cd00dd7352cd .hgignore --- a/.hgignore Wed Oct 19 16:35:17 2011 +0200 +++ b/.hgignore Wed Dec 28 16:35:48 2011 +0100 @@ -21,4 +21,10 @@ syntax: regexp ^web/regardssignes/\.htaccess$ syntax: regexp -^web/regardssignes/config\.py$ \ No newline at end of file +^web/regardssignes/config\.py$ +syntax: regexp +^\.settings/org\.eclipse\.core\.resources\.prefs$ +syntax: regexp +^\.settings/org\.eclipse\.core\.resources\.prefs$ +syntax: regexp +^\.settings/org\.eclipse\.core\.runtime\.prefs$ \ No newline at end of file diff -r 53cbef6ffd6a -r cd00dd7352cd virtualenv/res/lib/lib_create_env.py --- a/virtualenv/res/lib/lib_create_env.py Wed Oct 19 16:35:17 2011 +0200 +++ b/virtualenv/res/lib/lib_create_env.py Wed Dec 28 16:35:48 2011 +0100 @@ -30,7 +30,8 @@ 'DJANGO_OPENID_CONSUMER': {'setup':'django_openid_consumer', 'url':'http://pypi.python.org/packages/source/d/django-openid-consumer/django-openid-consumer-0.1.1.tar.gz', 'local':"django-openid-consumer-0.1.1.tar.gz"}, 'SOCIAL_AUTH': {'setup':'social_auth', 'url':'https://github.com/omab/django-social-auth/tarball/v0.3.10', 'local':"omab-django-social-auth-v0.3.10-modified.tar.gz"}, 'SOUTH': { 'setup': 'South', 'url':'http://www.aeracode.org/releases/south/south-0.7.3.tar.gz', 'local':"south-0.7.3.tar.gz"}, - 'LDT': { 'setup': 'ldt', 'url':'ldt-0.20.tar.gz', 'local':"ldt-0.20.tar.gz"}, + 'GUARDIAN': { 'setup': 'guardian', 'url':'django-guardian-1.0.3.tar.gz', 'local':"django-guardian-1.0.3.tar.gz"}, + 'LDT': { 'setup': 'ldt', 'url':'ldt-0.21.tar.gz', 'local':"ldt-0.21.tar.gz"}, } if system_str == 'Windows': diff -r 53cbef6ffd6a -r cd00dd7352cd virtualenv/res/src/django-guardian-1.0.3.tar.gz Binary file virtualenv/res/src/django-guardian-1.0.3.tar.gz has changed diff -r 53cbef6ffd6a -r cd00dd7352cd virtualenv/res/src/ldt-0.20.tar.gz Binary file virtualenv/res/src/ldt-0.20.tar.gz has changed diff -r 53cbef6ffd6a -r cd00dd7352cd virtualenv/res/src/ldt-0.21.tar.gz Binary file virtualenv/res/src/ldt-0.21.tar.gz has changed diff -r 53cbef6ffd6a -r cd00dd7352cd web/regardssignes/config.py.tmpl --- a/web/regardssignes/config.py.tmpl Wed Oct 19 16:35:17 2011 +0200 +++ b/web/regardssignes/config.py.tmpl Wed Dec 28 16:35:48 2011 +0100 @@ -47,6 +47,12 @@ } } +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.dummy.DummyCache', + } +} + DEBUG = True TEMPLATE_DEBUG = DEBUG @@ -79,3 +85,8 @@ EMPTY_MEDIA_EXTERNALID = None AUTO_INDEX_AFTER_SAVE = True + +USE_GROUP_PERMISSIONS = ['Project', 'Content', 'Media'] +FORBIDDEN_STREAM_URL = "rtmp://media.iri.centrepompidou.fr/ddc_player/mp4:video/forbidden_stream.mp4?old_path=" +PUBLIC_GROUP_NAME = 'everyone' +MAX_USERS_SEARCH = 20 diff -r 53cbef6ffd6a -r cd00dd7352cd web/regardssignes/settings.py --- a/web/regardssignes/settings.py Wed Oct 19 16:35:17 2011 +0200 +++ b/web/regardssignes/settings.py Wed Dec 28 16:35:48 2011 +0100 @@ -138,6 +138,7 @@ 'piston', 'social_auth', 'south', + 'guardian', ) AUTH_PROFILE_MODULE = 'user.UserProfile' @@ -162,6 +163,7 @@ # 'social_auth.backends.contrib.orkut.OrkutBackend', 'social_auth.backends.OpenIDBackend', 'django.contrib.auth.backends.ModelBackend', + 'guardian.backends.ObjectPermissionBackend', ) SOCIAL_AUTH_IMPORT_BACKENDS = ( 'myproy.social_auth_extra_services', @@ -202,6 +204,8 @@ AUTO_INDEX_AFTER_SAVE = True +ANONYMOUS_USER_ID = -1 + WEB_VERSION = regardssignes.get_version() from config import *