Merge pull request #63 from Haos616/develop

Changed view errors for ConcurrencyListEditableMixin

Author: saxix

src/concurrency/admin.py

@@ -224,18 +224,19 @@ def message_user(self, request, message, *args, **kwargs):
             concurrency_errros = len(conflicts)
             if m:
                 updated_record = int(m.group('num')) - concurrency_errros
-                if updated_record == 0:
-                    message = _("No %(name)s were changed due conflict errors") % {'name': names[0]}
+
+                ids = ",".join(map(str, conflicts))
+                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_text(opts.verbose_name)
                 else:
-                    ids = ",".join(map(str, conflicts))
-                    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_text(opts.verbose_name)
-                    else:
-                        name = force_text(opts.verbose_name_plural)
+                    name = force_text(opts.verbose_name_plural)
+
+                message = None
+                if updated_record > 0:
                     message = ungettext("%(count)s %(name)s was changed successfully.",
                                         "%(count)s %(name)s were changed successfully.",
                                         updated_record) % {'count': updated_record,

tests/test_admin_list_editable.py

@@ -116,8 +116,7 @@ def test_message_user_no_changes(self):
 
         messages = list(map(str, list(res.context['messages'])))
 
-        self.assertIn('No %s were changed due conflict errors' % force_text(self.TARGET._meta.verbose_name),
-                      messages)
+        self.assertIn('Record with pk `%s` has been modified and was not updated' % id, messages)
         self.assertEqual(len(messages), 1)
 
     def test_log_change(self):