changeset 382:e0ef325cbdea

auth functions little fix
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 03 Aug 2010 21:24:45 +0200
parents 55377fdc1fc6
children 04f8fd55e6bc
files pylons_app/lib/auth.py
diffstat 1 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pylons_app/lib/auth.py	Sun Aug 01 18:36:00 2010 +0200
+++ b/pylons_app/lib/auth.py	Tue Aug 03 21:24:45 2010 +0200
@@ -107,17 +107,19 @@
 
 def fill_data(user):
     """
-    Fills user data with those from database
+    Fills user data with those from database and log out user if not present
+    in database
     @param user:
     """
     sa = meta.Session
     dbuser = sa.query(User).get(user.user_id)
-    
-    user.username = dbuser.username
-    user.is_admin = dbuser.admin
-    user.name = dbuser.name
-    user.lastname = dbuser.lastname
-    
+    if dbuser:
+        user.username = dbuser.username
+        user.is_admin = dbuser.admin
+        user.name = dbuser.name
+        user.lastname = dbuser.lastname
+    else:
+        user.is_authenticated = False
     meta.Session.remove()
     return user