fixes saxix#15

- send proper messages to user when concurrency avoid updates
- do not creaet LogEntry in the admin when concurrency avoid updates

Author: saxix

concurrency/admin.py

@@ -1,6 +1,7 @@
 ## -*- coding: utf-8 -*-
 from __future__ import absolute_import, unicode_literals
-from django.utils.encoding import force_text
+import re
+from django.utils.encoding import force_text, force_unicode
 from django.contrib import admin, messages
 from django.core.exceptions import ImproperlyConfigured, ValidationError
 from django.db.models import Q
@@ -10,7 +11,7 @@
 from django.utils.safestring import mark_safe
 from django.contrib.admin import helpers
 from django.http import HttpResponse, HttpResponseRedirect
-from django.utils.translation import ugettext as _
+from django.utils.translation import ungettext, ugettext as _
 from concurrency import forms
 from concurrency.api import get_revision_of_object, get_version_fieldname
 from concurrency.config import conf, CONCURRENCY_LIST_EDITABLE_POLICY_SILENT
@@ -162,8 +163,9 @@ def save_model(self, request, obj, form, change):
                     setattr(obj, get_version_fieldname(obj), int(version))
             super(ConcurrencyListEditableMixin, self).save_model(request, obj, form, change)
         except RecordModifiedError:
+            self._concurrency_list_editable_errors.append(obj.pk)
             if self.list_editable_policy == CONCURRENCY_LIST_EDITABLE_POLICY_SILENT:
-                messages.error(request, _("Record with pk `{0.pk}` has been modified and was not updated").format(obj))
+                pass
             else:
                 raise
 
@@ -174,5 +176,49 @@ class ConcurrentModelAdmin(ConcurrencyActionMixin,
     form = ConcurrentForm
     formfield_overrides = {forms.VersionField: {'widget': VersionWidget}}
 
+    def changelist_view(self, request, extra_context=None):
+        self._concurrency_list_editable_errors = []
+        return super(ConcurrentModelAdmin, self).changelist_view(request, extra_context)
+
     def save_model(self, request, obj, form, change):
         return super(ConcurrentModelAdmin, self).save_model(request, obj, form, change)
+
+    def log_change(self, request, object, message):
+        if object.pk in self._concurrency_list_editable_errors:
+            return
+        super(ConcurrentModelAdmin, self).log_change(request, object, message)
+
+    def log_deletion(self, request, object, object_repr):
+        if object.pk in self._concurrency_list_editable_errors:
+            return
+        super(ConcurrentModelAdmin, self).log_deletion(request, object, object_repr)
+
+    def message_user(self, request, message, **kwargs):
+        # This is ugly but we do not want to touch the changelist_view() code.
+        opts = self.model._meta
+        if self._concurrency_list_editable_errors:
+            names = force_unicode(opts.verbose_name), force_unicode(opts.verbose_name_plural)
+            pattern = ur"(?P<num>\d+) ({0}|{1})".format(*names)
+            rex = re.compile(pattern)
+            m = rex.match(message)
+            concurrency_errros = len(self._concurrency_list_editable_errors)
+            if m:
+                updated_record = int(m.group('num')) - len(self._concurrency_list_editable_errors)
+                if updated_record == 0:
+                    message = _("No %(name)s were changed due conflict errors" % {'name': names[0]})
+                else:
+                    ids = ",".join(map(str, self._concurrency_list_editable_errors))
+                    messages.error(request,
+                                   ungettext("Record with pk `{0}` has been modified and was not updated",
+                                             "Records `{0}` have been modified and were not updated",
+                                             concurrency_errros).format(ids))
+                    if updated_record == 1:
+                        name = force_unicode(opts.verbose_name)
+                    else:
+                        name = force_unicode(opts.verbose_name_plural)
+                    message = ungettext("%(count)s %(name)s was changed successfully.",
+                                        "%(count)s %(name)s were changed successfully.",
+                                        updated_record) % {'count': updated_record,
+                                                           'name': name}
+
+        return super(ConcurrentModelAdmin, self).message_user(request, message, **kwargs)

concurrency/tests/admin_list_editable.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 from concurrency.tests.base import AdminTestCase, SENTINEL
 from concurrency.tests.models import ListEditableConcurrentModel, NoActionsConcurrentModel
+from django.contrib.admin.models import LogEntry
+from django.contrib.contenttypes.models import ContentType
 
 
 class TestListEditable(AdminTestCase):
@@ -39,6 +41,56 @@ def test_concurrency(self):
         self.assertTrue(self.TARGET.objects.filter(dummy_char=SENTINEL).exists())
         self.assertFalse(self.TARGET.objects.filter(dummy_char='CHAR').exists())
 
+    def test_message_user(self):
+        res = self.app.get('/admin/', user='sax')
+        res = res.click(self.TARGET._meta.verbose_name_plural)
+
+        self._create_conflict(1)
+
+        form = res.forms['changelist-form']
+        form['form-0-dummy_char'] = 'CHAR1'
+        form['form-1-dummy_char'] = 'CHAR2'
+        res = form.submit('_save').follow()
+
+        messages = map(str, list(res.context['messages']))
+
+        self.assertIn('Record with pk `1` has been modified and was not updated',
+                      messages)
+        self.assertIn('1 ListEditable-ConcurrentModel was changed successfully.',
+                      messages)
+
+    def test_message_user_no_changes(self):
+        res = self.app.get('/admin/', user='sax')
+        res = res.click(self.TARGET._meta.verbose_name_plural)
+
+        self._create_conflict(1)
+
+        form = res.forms['changelist-form']
+        form['form-0-dummy_char'] = 'CHAR1'
+        res = form.submit('_save').follow()
+
+        messages = map(str, list(res.context['messages']))
+
+        self.assertIn('No ListEditable-ConcurrentModel were changed due conflict errors',
+                      messages)
+        self.assertEqual(len(messages), 1)
+
+    def test_log_change(self):
+        res = self.app.get('/admin/', user='sax')
+        res = res.click(self.TARGET._meta.verbose_name_plural)
+        log_filter = dict(user__username='sax',
+                          content_type=ContentType.objects.get_for_model(self.TARGET))
+
+        logs = list(LogEntry.objects.filter(**log_filter).values_list('pk', flat=True))
+
+        self._create_conflict(1)
+
+        form = res.forms['changelist-form']
+        form['form-0-dummy_char'] = 'CHAR1'
+        res = form.submit('_save').follow()
+        new_logs = LogEntry.objects.filter(**log_filter).exclude(id__in=logs).exists()
+        self.assertFalse(new_logs, "LogEntry created even if conflict error")
+
 
 class TestListEditableWithNoActions(TestListEditable):
     TARGET = NoActionsConcurrentModel