Created attachment 942180 [details] Screenshot of error Description of problem: If two users encounter a concurrency / conflict issue on translating the same target, the user who needs to resolve the conflict is given an empty dialog. This disallows them from resolving the conflict and generates errors when they attempt to save/edit the target. Version-Release number of selected component (if applicable): 3.5.0-SNAPSHOT (git-jenkins-zanata-server-build+verify-nightly-release-1167-296-g18385b6) How reproducible: Easy always Steps to Reproduce: 1. Two users sign in, go to the same project,version,document,target 2. User 1 edits the field, but does not save 3. User 2 edits the field and saves Actual results: User 1 is presented with a conflict resolution (history) dialog that is empty. They cannot use this to repair the concurrent change. Expected results: A populated dialog with copy etc buttons Additional info:
https://github.com/zanata/zanata-server/pull/592
An issue with the current view is the popup will close on a "click elsewhere" action. There's an error notification right in front of it that, when clicked, causes this to occur. https://bugzilla.redhat.com/show_bug.cgi?id=1148259
Verified on 3.5.0-SNAPSHOT (git-jenkins-zanata-server-build+verify-nightly-release-1167-299-ga85e7f8)