Merge branch 'current_branch' into 'dev'

Current branch

See merge request !141

access/middleware.py

@@ -40,6 +40,7 @@ class UpdateActivity(object):
     @staticmethod
     def process_request(request):
         if not request.user.is_anonymous:
+
             user_activity = UserActivity.objects.get(owner=request.user)
             ip = request.META.get('REMOTE_ADDR', None)
             if user_activity.ip_list is None:

access/views.py

@@ -153,7 +153,7 @@ class DetailUserView(APIView):
             try:
                 acc['b_day'] = datetime.datetime.strptime(acc['b_day'], '%Y.%m.%d')
             except ValueError:
-                pass
+                acc['b_day'] = None
 
         acc['gender'] = 0 if acc['gender'] == "undefined" else 1 if acc['gender'] == "male" else 2
 

lms/settings.py

@@ -122,7 +122,7 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     #'access.middleware.CheckPerm',
     'access.middleware.RequestToApi',
-    # 'access.middleware.UpdateActivity',
+    'access.middleware.UpdateActivity',
 ]
 
 REST_FRAMEWORK = {