Browse Source

log event's author in message

Rafał Pitoń 8 years ago
parent
commit
7e319107a8

+ 1 - 1
misago/users/api/userendpoints/editdetails.py

@@ -42,7 +42,7 @@ def submit_form(request, user):
     )
     )
 
 
     if form.is_valid():
     if form.is_valid():
-        profilefields.update_user_profile_fields(user, form)
+        profilefields.update_user_profile_fields(request, user, form)
         user.save(update_fields=['profile_fields'])
         user.save(update_fields=['profile_fields'])
 
 
         return Response(serialize_profilefields_data(request, profilefields, user))
         return Response(serialize_profilefields_data(request, profilefields, user))

+ 7 - 2
misago/users/profilefields/__init__.py

@@ -130,7 +130,7 @@ class ProfileFields(object):
 
 
         return cleaned_data
         return cleaned_data
 
 
-    def update_user_profile_fields(self, user, form):
+    def update_user_profile_fields(self, request, user, form):
         old_fields = copy.copy(user.profile_fields or {})
         old_fields = copy.copy(user.profile_fields or {})
 
 
         new_fields = {}
         new_fields = {}
@@ -140,8 +140,13 @@ class ProfileFields(object):
         user.profile_fields = new_fields
         user.profile_fields = new_fields
 
 
         if old_fields != new_fields:
         if old_fields != new_fields:
+            if request.user == user:
+                log_message = "{} edited own profile fields".format(user.username)
+            else:
+                log_message = "{} edited {}'s (#{}) profile fields".format(request.user, user.username, user.pk)
+
             logger.info(
             logger.info(
-                "Changed {}'s (ID: {}) profile fields".format(user.username, user.pk),
+                log_message,
                 extra={
                 extra={
                     'old_fields': old_fields,
                     'old_fields': old_fields,
                     'new_fields': new_fields,
                     'new_fields': new_fields,

+ 1 - 1
misago/users/views/admin/users.py

@@ -311,7 +311,7 @@ class EditUser(UserAdmin, generic.ModelFormView):
 
 
         set_user_signature(request, target, form.cleaned_data.get('signature'))
         set_user_signature(request, target, form.cleaned_data.get('signature'))
 
 
-        profilefields.update_user_profile_fields(target, form)
+        profilefields.update_user_profile_fields(request, target, form)
 
 
         target.update_acl_key()
         target.update_acl_key()
         target.save()
         target.save()