summaryrefslogtreecommitdiff
path: root/drupal_auth
diff options
context:
space:
mode:
authorJayaram R Pai2014-10-07 18:39:04 +0530
committerJayaram R Pai2014-10-07 18:39:04 +0530
commitb665812a483c9181aec47073223d950b5b04fa1e (patch)
treecd965c50aef0129c69df99ae89444d892181017c /drupal_auth
parent40522e19aca14a1625229c2abfa34ff8e50c7c9d (diff)
downloadspoken-tutorial-forums-b665812a483c9181aec47073223d950b5b04fa1e.tar.gz
spoken-tutorial-forums-b665812a483c9181aec47073223d950b5b04fa1e.tar.bz2
spoken-tutorial-forums-b665812a483c9181aec47073223d950b5b04fa1e.zip
changed auth db
Diffstat (limited to 'drupal_auth')
-rw-r--r--drupal_auth/backends.py3
-rw-r--r--drupal_auth/models.py11
-rw-r--r--drupal_auth/routers.py4
3 files changed, 10 insertions, 8 deletions
diff --git a/drupal_auth/backends.py b/drupal_auth/backends.py
index 2b29615..8f1a6bd 100644
--- a/drupal_auth/backends.py
+++ b/drupal_auth/backends.py
@@ -3,11 +3,14 @@ import hashlib
from django.contrib.auth.models import User
from django.contrib.auth import get_user_model
from django.shortcuts import render_to_response, get_object_or_404
+from django.contrib.auth.models import update_last_login
+from django.contrib.auth.signals import user_logged_in
User = get_user_model()
class DrupalAuthBackend(object):
def authenticate(self, username=None, password=None):
+ user_logged_in.disconnect(update_last_login)
try:
user = User.objects.get(username=username)
p = hashlib.md5()
diff --git a/drupal_auth/models.py b/drupal_auth/models.py
index 9e7fe5f..5161d65 100644
--- a/drupal_auth/models.py
+++ b/drupal_auth/models.py
@@ -7,11 +7,10 @@ from django.contrib.auth.models import (
from drupal_auth.managers import DrupalUserManager
class Users(models.Model):
- id = models.IntegerField(primary_key=True, db_column='uid')
- username = models.CharField(max_length=60L, unique=True, db_column='name')
- password = models.CharField(max_length=32L, db_column='pass') # Field renamed because it was a Python reserved word.
- email = models.CharField(max_length=200L, db_column='mail')
- last_login = models.DateTimeField(auto_now_add=True)
+ id = models.BigIntegerField(primary_key=True)
+ username = models.CharField(max_length=100L, unique=True)
+ password = models.CharField(max_length=32L)
+ email = models.CharField(max_length=100L)
USERNAME_FIELD = 'username'
REQUIRED_FIELDS = []
@@ -21,7 +20,7 @@ class Users(models.Model):
return self.username
class Meta:
- db_table = 'users'
+ db_table = 'mdl_user'
def is_authenticated(self):
return True
diff --git a/drupal_auth/routers.py b/drupal_auth/routers.py
index 299712a..846df14 100644
--- a/drupal_auth/routers.py
+++ b/drupal_auth/routers.py
@@ -1,12 +1,12 @@
class DrupalAuthRouter(object):
def db_for_read(self, model, **hints):
if model._meta.app_label == 'drupal_auth':
- return 'spoken'
+ return 'otc'
return 'default'
def db_for_write(self, model, **hints):
if model._meta.app_label == 'drupal_auth':
- return 'spoken'
+ return 'otc'
return 'default'
def allow_relation(self, obj1, obj2, **hints):