--- a/src/ldt/ldt/ldt_utils/middleware/userprofile.py Thu Sep 08 15:56:19 2011 +0200
+++ b/src/ldt/ldt/ldt_utils/middleware/userprofile.py Fri Sep 09 11:40:09 2011 +0200
@@ -1,11 +1,12 @@
-from ldt.user.models import get_or_create_profile
from django.utils import translation
class LanguageMiddleware(object):
def process_request(self, request):
if request.user.is_authenticated():
- language = get_or_create_profile(request.user).language
+ language = request.user.get_profile().language
translation.activate(language)
request.LANGUAGE_CODE = translation.get_language()
+
+
\ No newline at end of file
--- a/src/ldt/ldt/user/forms.py Thu Sep 08 15:56:19 2011 +0200
+++ b/src/ldt/ldt/user/forms.py Fri Sep 09 11:40:09 2011 +0200
@@ -4,7 +4,6 @@
from django.contrib.auth.models import User
from django.forms.util import ErrorList
from django.utils.translation import gettext as _
-from ldt.user.models import get_or_create_profile
from models import Ldt
@@ -114,7 +113,7 @@
super(LanguageChangeForm, self).__init__(*args, **kwargs)
def save(self):
- profile = get_or_create_profile(self.user)
+ profile = self.user.get_profile()
profile.language = self.cleaned_data['language']
profile.save()
return self.user
--- a/src/ldt/ldt/user/migrations/0003_auto__add_userprofile.py Thu Sep 08 15:56:19 2011 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-# 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 model 'UserProfile'
- db.create_table('user_userprofile', (
- ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
- ('language', self.gf('django.db.models.fields.CharField')(default='fr', max_length=2)),
- ))
- db.send_create_signal('user', ['UserProfile'])
-
-
- def backwards(self, orm):
-
- # Deleting model 'UserProfile'
- db.delete_table('user_userprofile')
-
-
- 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'}),
- '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']
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/user/migrations/0004_fill_language.py Fri Sep 09 11:40:09 2011 +0200
@@ -0,0 +1,73 @@
+#@PydevCodeAnalysisIgnore
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import DataMigration
+from django.db import models
+from django.contrib.auth.models import User
+from ldt.user.models import UserProfile
+
+class Migration(DataMigration):
+
+ def forwards(self, orm):
+ "Write your forwards methods here."
+
+ for i in User.objects.all():
+ UserProfile.objects.create(user=i)
+
+
+
+ def backwards(self, orm):
+ "Write your backwards methods here."
+
+
+ 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'}),
+ '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']
--- a/src/ldt/ldt/user/models.py Thu Sep 08 15:56:19 2011 +0200
+++ b/src/ldt/ldt/user/models.py Fri Sep 09 11:40:09 2011 +0200
@@ -1,6 +1,7 @@
from django.contrib import admin
from django.db import models
from django.contrib.auth.models import User, UserManager
+from django.db.models.signals import post_save
import datetime
class Ldt(User):
@@ -24,23 +25,20 @@
else:
new_user.set_unusable_password()
new_user.save()
- UserProfile.objects.create(user=new_user)
return new_user
class UserProfile (models.Model):
user = models.OneToOneField(User)
language = models.CharField(max_length=2, default='fr')
-
-
-def get_or_create_profile(user):
- try:
- profile = user.get_profile()
- except UserProfile.DoesNotExist:
- profile = UserProfile(user=user)
- profile.save()
- return profile
+ @staticmethod
+ def create_user_profile(sender, instance, created, **kwargs):
+ if created:
+ UserProfile.objects.create(user=instance)
+
+
+post_save.connect(UserProfile.create_user_profile, sender=User)
User.objects = LdtManager()
User.objects.contribute_to_class(User, "objects")
--- a/src/ldt/ldt/user/views.py Thu Sep 08 15:56:19 2011 +0200
+++ b/src/ldt/ldt/user/views.py Fri Sep 09 11:40:09 2011 +0200
@@ -7,14 +7,13 @@
from django.utils import simplejson
from django.utils.translation import ugettext as _
from forms import ProfileForm, LanguageChangeForm
-from ldt.user.models import get_or_create_profile
from django.views.i18n import set_language
@login_required
def profile(request):
msg = ''
- user_language = get_or_create_profile(request.user).language
+ user_language = request.user.get_profile().language
if request.method == "POST":
profile_form = ProfileForm(request.user, request.POST, instance=request.user)
@@ -28,7 +27,7 @@
language_form.save()
set_language(request)
msg = _("Your profile has been updated.")
- user_language = get_or_create_profile(request.user).language
+ user_language = request.user.get_profile().language
#assert False, "after: %s " % request.user.username
@@ -43,7 +42,7 @@
@login_required
def password(request):
msg = ''
- user_language = get_or_create_profile(request.user).language
+ user_language = request.user.get_profile().language
if request.method == "POST":
password_form = PasswordChangeForm(request.user, request.POST)
--- a/web/ldtplatform/settings.py Thu Sep 08 15:56:19 2011 +0200
+++ b/web/ldtplatform/settings.py Fri Sep 09 11:40:09 2011 +0200
@@ -84,7 +84,7 @@
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.middleware.locale.LocaleMiddleware',
+ #'django.middleware.locale.LocaleMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django_openid_consumer.middleware.OpenIDMiddleware',
'ldt.ldt_utils.middleware.userprofile.LanguageMiddleware',
@@ -188,6 +188,18 @@
SOCIAL_AUTH_COMPLETE_URL_NAME = 'complete'
SOCIAL_AUTH_ASSOCIATE_URL_NAME = 'associate_complete'
+# twitter testing
+TEST_TWITTER_USER = 'jacquesverrier@gmail.com'
+TEST_TWITTER_PASSWORD = 'atanyatson'
+
+# facebook testing
+#TEST_FACEBOOK_USER = 'testing_account'
+#TEST_FACEBOOK_PASSWORD = 'password_for_testing_account'
+
+# google testing
+TEST_GOOGLE_USER = 'jacquesverrier@gmail.com'
+TEST_GOOGLE_PASSWORD = 'fti:"\'plesimer'
+
AUTO_INDEX_AFTER_SAVE = True
WEB_VERSION = ldtplatform.get_version()