Enhancement: Add admin UI for resolving concurrency exceptions

[pombredanne]

It would be great to have a basic admin ui to resolve concurrency exceptions....
Something that could show:

• The fields before editing by the current user
• The fields as edited by the current user
• The fields as they were edited by others
  And provide the ability to resolve and save a new object with the conflicts manually resolved ...

[saxix]

Agree, I'm working on the admin integration just now. Just committed the code to handle admin's action. Next release should contains other admin related features. Any help will be appreciated.

[pombredanne]

I kinda like the diff-match-patch diff displayed by https://github.com/bmihelac/django-import-export when doing imports for existing records
This could allow to show only two things for each field:

• the concurrent edit diff between the user edit and the conflicting edit made by someone else
• the editable value (populated with the value the user edited/updated)

[saxix]

take a look at https://django-concurrency.readthedocs.org/en/latest/middleware.html if can help in the meantime

[pombredanne]

Sounds like the proper basis alright

[saxix]

added an example of ConcurrencyMiddleware in fbd3762
refer to https://django-concurrency.readthedocs.org/en/latest/middleware.html

In the demo app there is the same code, but the settings required are commented out to allow the tests to pass.