From 4592a9656afe07739bf2a82823492a713af90dce Mon Sep 17 00:00:00 2001 From: Zambom Date: Sat, 5 Nov 2016 19:11:42 -0300 Subject: [PATCH] Making middleware ignore ajax request [Issue: #231] --- core/middleware.py | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/core/middleware.py b/core/middleware.py index fe7da5e..e5e3ccc 100644 --- a/core/middleware.py +++ b/core/middleware.py @@ -9,32 +9,33 @@ class TimeSpentMiddleware(object): self.get_response = get_response def process_request(self, request): - log_id = request.session.get('log_id', None) + if not request.is_ajax(): + log_id = request.session.get('log_id', None) - if not log_id is None: - log = get_object_or_404(Log, id = log_id) + if not log_id is None: + log = get_object_or_404(Log, id = log_id) - date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") - _now = datetime.now() - - time_spent = _now - date_time_click - - secs = time_spent.total_seconds() - hours = int(secs / 3600) - minutes = int(secs / 60) % 60 - secs = secs % 60 + date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f") + _now = datetime.now() + + time_spent = _now - date_time_click + + secs = time_spent.total_seconds() + hours = int(secs / 3600) + minutes = int(secs / 60) % 60 + secs = secs % 60 - log_context = json.loads(log.context) + log_context = json.loads(log.context) - log_context['time_spent'] = {} - log_context['time_spent']['hours'] = hours - log_context['time_spent']['minutes'] = minutes - log_context['time_spent']['seconds'] = secs + log_context['time_spent'] = {} + log_context['time_spent']['hours'] = hours + log_context['time_spent']['minutes'] = minutes + log_context['time_spent']['seconds'] = secs - log.context = json.dumps(log_context) + log.context = json.dumps(log_context) - log.save() + log.save() - request.session['log_id'] = None + request.session['log_id'] = None -- libgit2 0.21.2