Change in ovirt-engine[master]: webadmin: re-order gluster hook conflict actions

[kmayilsa at redhat.com]

Kanagaraj M has submitted this change and it was merged.

Change subject: webadmin: re-order gluster hook conflict actions
......................................................................


webadmin: re-order gluster hook conflict actions

When a hook has both content and missing conflicts
if the user selects 'Remove' to resolve a missing
conflict then the content conflict actions should be disabled.

Also moved the missing conflict to the top.

Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9
Bug-Url: https://bugzilla.redhat.com/975795
Signed-off-by: Kanagaraj M <kmayilsa at redhat.com>
---
M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/GlusterHookResolveConflictsModel.java
M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/GlusterHookResolveConflictsPopupView.ui.xml
2 files changed, 18 insertions(+), 8 deletions(-)

Approvals:
  Kanagaraj M: Verified; Looks good to me, approved



-- 
To view, visit http://gerrit.ovirt.org/16630
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7d425f79b0c0c22605b2343e892851de33f16e9
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Kanagaraj M <kmayilsa at redhat.com>
Gerrit-Reviewer: Gilad Chaplik <gchaplik at redhat.com>
Gerrit-Reviewer: Kanagaraj M <kmayilsa at redhat.com>
Gerrit-Reviewer: Sahina Bose <sabose at redhat.com>
Gerrit-Reviewer: oVirt Jenkins CI Server