equal
deleted
inserted
replaced
3 from django.db.models import signals |
3 from django.db.models import signals |
4 from datetime import datetime, timedelta |
4 from datetime import datetime, timedelta |
5 from time import mktime |
5 from time import mktime |
6 import django.dispatch |
6 import django.dispatch |
7 import logging |
7 import logging |
|
8 from cm.cm_settings import STORE_ACTIVITY_IP |
8 |
9 |
9 def register_activity(request, type, text=None, comment=None, user=None, text_version=None): |
10 def register_activity(request, type, text=None, comment=None, user=None, text_version=None): |
10 signal_activity.send(sender=text, request=request, type=type, comment=comment, user=user, text_version=text_version) |
11 signal_activity.send(sender=text, request=request, type=type, comment=comment, user=user, text_version=text_version) |
11 |
12 |
12 # activity signal |
13 # activity signal |
20 user = kwargs['user'] |
21 user = kwargs['user'] |
21 |
22 |
22 text = sender |
23 text = sender |
23 text_version = kwargs.get('text_version', None) |
24 text_version = kwargs.get('text_version', None) |
24 if not text_version and text: |
25 if not text_version and text: |
25 text_version = text.last_text_version |
26 text_version = text.last_text_version |
26 |
27 |
27 if request.user.is_anonymous(): |
28 if request.user.is_anonymous(): |
28 originator_user = None |
29 originator_user = None |
29 else: |
30 else: |
30 originator_user = request.user |
31 originator_user = request.user |
31 ip = request.META['REMOTE_ADDR'] |
32 |
|
33 if STORE_ACTIVITY_IP: |
|
34 ip = request.META['REMOTE_ADDR'] |
|
35 else: |
|
36 ip = None |
|
37 |
32 Activity.objects.create(text=text, user=user, text_version=text_version, comment=comment, type=type, ip=ip, originator_user=originator_user) |
38 Activity.objects.create(text=text, user=user, text_version=text_version, comment=comment, type=type, ip=ip, originator_user=originator_user) |
33 |
39 |
34 def connect_all(): |
40 def connect_all(): |
35 signal_activity.connect(_save_activity) |
41 signal_activity.connect(_save_activity) |
36 |
42 |