Commit 4592a9656afe07739bf2a82823492a713af90dce

Authored by Zambom
1 parent 9220ddac

Making middleware ignore ajax request [Issue: #231]

Showing 1 changed file with 21 additions and 20 deletions   Show diff stats
core/middleware.py
... ... @@ -9,32 +9,33 @@ class TimeSpentMiddleware(object):
9 9 self.get_response = get_response
10 10  
11 11 def process_request(self, request):
12   - log_id = request.session.get('log_id', None)
  12 + if not request.is_ajax():
  13 + log_id = request.session.get('log_id', None)
13 14  
14   - if not log_id is None:
15   - log = get_object_or_404(Log, id = log_id)
  15 + if not log_id is None:
  16 + log = get_object_or_404(Log, id = log_id)
16 17  
17   - date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f")
18   - _now = datetime.now()
19   -
20   - time_spent = _now - date_time_click
21   -
22   - secs = time_spent.total_seconds()
23   - hours = int(secs / 3600)
24   - minutes = int(secs / 60) % 60
25   - secs = secs % 60
  18 + date_time_click = datetime.strptime(request.session.get('time_spent'), "%Y-%m-%d %H:%M:%S.%f")
  19 + _now = datetime.now()
  20 +
  21 + time_spent = _now - date_time_click
  22 +
  23 + secs = time_spent.total_seconds()
  24 + hours = int(secs / 3600)
  25 + minutes = int(secs / 60) % 60
  26 + secs = secs % 60
26 27  
27   - log_context = json.loads(log.context)
  28 + log_context = json.loads(log.context)
28 29  
29   - log_context['time_spent'] = {}
30   - log_context['time_spent']['hours'] = hours
31   - log_context['time_spent']['minutes'] = minutes
32   - log_context['time_spent']['seconds'] = secs
  30 + log_context['time_spent'] = {}
  31 + log_context['time_spent']['hours'] = hours
  32 + log_context['time_spent']['minutes'] = minutes
  33 + log_context['time_spent']['seconds'] = secs
33 34  
34   - log.context = json.dumps(log_context)
  35 + log.context = json.dumps(log_context)
35 36  
36   - log.save()
  37 + log.save()
37 38  
38   - request.session['log_id'] = None
  39 + request.session['log_id'] = None
39 40  
40 41  
... ...