From 19f4c7b95bf32d0cf581274d947bdc9120c2e8f2 Mon Sep 17 00:00:00 2001
From: prathamesh
Date: Fri, 8 Jul 2016 10:45:38 +0530
Subject: oauth implemented

User can login via google and facebook.
If user logs in from google and then later the same user
logs in from facebook, then he will be considered as the same user if
the email registered on facebook is of gmail.
User profile will be created when user logs in via facebook or google.
In yaksh pipeline, user.py is used to create profile. Pipeline settings
is defined that defines the functions to be executed during oauth.
Used bootstrap social and Font Awesome for UI design
---
 yaksh/middleware/user_time_zone.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'yaksh/middleware/user_time_zone.py')

diff --git a/yaksh/middleware/user_time_zone.py b/yaksh/middleware/user_time_zone.py
index f1aace9..0bd4831 100644
--- a/yaksh/middleware/user_time_zone.py
+++ b/yaksh/middleware/user_time_zone.py
@@ -8,8 +8,8 @@ class TimezoneMiddleware(object):
         if user timezone is not available default value 'UTC' is activated """
     def process_request(self, request):
         user = request.user
+        user_tz = 'UTC'
         if hasattr(user, 'profile'):
-            user_tz = user.profile.timezone
-            timezone.activate(pytz.timezone(user_tz))
-        else:
-            timezone.activate(pytz.timezone('UTC'))
+            if user.profile.timezone:
+                user_tz = user.profile.timezone
+        timezone.activate(pytz.timezone(user_tz))
-- 
cgit