# HG changeset patch # User verrierj # Date 1322135681 -3600 # Node ID ff7ccbbba32925e260ee4f869c2b7b8f62d8de09 # Parent 5c5fab6d8ae8325b9533caa2ac05efe588e3900a Add is_regular field to user_profile diff -r 5c5fab6d8ae8 -r ff7ccbbba329 src/ldt/ldt/ldt_utils/middleware/security.py --- a/src/ldt/ldt/ldt_utils/middleware/security.py Wed Nov 23 16:20:20 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -from django.conf import settings -from django.core.exceptions import MiddlewareNotUsed -from ldt.ldt_utils.security import protect_models, unprotect_models - -class SecurityMiddleware(object): - - def __init__(self): - if not hasattr(settings, 'USE_GROUP_PERMISSIONS') or not settings.USE_GROUP_PERMISSIONS: - raise MiddlewareNotUsed() - - # !! Will not work with concurrent requests - def process_request(self, request): - protect_models(request) - - def process_response(self, request, response): - unprotect_models(request) - - return response \ No newline at end of file diff -r 5c5fab6d8ae8 -r ff7ccbbba329 src/ldt/ldt/ldt_utils/middleware/userprofile.py --- a/src/ldt/ldt/ldt_utils/middleware/userprofile.py Wed Nov 23 16:20:20 2011 +0100 +++ b/src/ldt/ldt/ldt_utils/middleware/userprofile.py Thu Nov 24 12:54:41 2011 +0100 @@ -4,9 +4,12 @@ def process_request(self, request): if request.user.is_authenticated(): - language = request.user.get_profile().language + profile = request.user.get_profile() + language = profile.language translation.activate(language) request.LANGUAGE_CODE = translation.get_language() + request.user.is_regular = profile.is_regular + \ No newline at end of file diff -r 5c5fab6d8ae8 -r ff7ccbbba329 src/ldt/ldt/user/migrations/0005_auto__add_field_userprofile_is_regular.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/user/migrations/0005_auto__add_field_userprofile_is_regular.py Thu Nov 24 12:54:41 2011 +0100 @@ -0,0 +1,71 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding field 'UserProfile.is_regular' + db.add_column('user_userprofile', 'is_regular', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False) + + + def backwards(self, orm): + + # Deleting field 'UserProfile.is_regular' + db.delete_column('user_userprofile', 'is_regular') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'user.ldt': { + 'Meta': {'object_name': 'Ldt', '_ormbases': ['auth.User']}, + 'user_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True', 'primary_key': 'True'}) + }, + 'user.userprofile': { + 'Meta': {'object_name': 'UserProfile'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_regular': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'language': ('django.db.models.fields.CharField', [], {'default': "'fr'", 'max_length': '2'}), + 'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}) + } + } + + complete_apps = ['user'] diff -r 5c5fab6d8ae8 -r ff7ccbbba329 src/ldt/ldt/user/models.py --- a/src/ldt/ldt/user/models.py Wed Nov 23 16:20:20 2011 +0100 +++ b/src/ldt/ldt/user/models.py Thu Nov 24 12:54:41 2011 +0100 @@ -34,6 +34,7 @@ class UserProfile (models.Model): user = models.OneToOneField(User) language = models.CharField(max_length=2, default=settings.LANGUAGE_CODE[:2]) + is_regular = models.BooleanField(default=False) @staticmethod def create_user_profile(sender, instance, created, **kwargs):