Daniel Erez has submitted this change and it was merged. Change subject: frontend: fix FcpStorageView faults ...................................................................... frontend: fix FcpStorageView faults FcpStorageView has four faults that are fixed in this patch: 1. It extends from AbstractSanStorageView, which is useless since it's the only subclass of AbstractSanStorageView. 2. The corresponding ui.xml file is AbstractSanStorageView.ui.xml (and not FcpStorageView.ui.xml), which causes the editor to ignore the label "errorMessage" in FcpStorageView and to malfunction. 3. The @Path annotation of the label "errorMessage" is "GetLUNsFailure", while the corresponding string field in the model, SanStorageModel, is "getLUNsFailure". 4. AbstractSanStorageView extends from AbstractStorageView<SanStorageModelBase>, while the model of FcpStorageView is SanStorageModel. This patch: - Merges AbstractSanStorageView into FcpStorageView. - Renames the AbstractSanStorageView.ui.xml to FcpStorageView.ui.xml. - Renames the Path annotation of the label "errorMessage" to "getLUNsFailure". - Replaces the generics type of AbstractStorageView to SanStorageModel. As a consequence, the label "errorMessage" is finally shown when it's supposed to be shown in the FcpStorageView. Change-Id: Idff765f50ce3d461c18f0db428687e7a27e8b64c Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1297689 Signed-off-by: Idan Shaby <ishaby@redhat.com> --- D frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/AbstractSanStorageView.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.java R frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/storage/FcpStorageView.ui.xml 3 files changed, 84 insertions(+), 103 deletions(-) Approvals: Daniel Erez: Looks good to me, approved Jenkins CI: Passed CI tests Freddy Rolland: Looks good to me, but someone else must approve Idan Shaby: Verified -- To view, visit https://gerrit.ovirt.org/51720 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idff765f50ce3d461c18f0db428687e7a27e8b64c Gerrit-PatchSet: 5 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Idan Shaby <ishaby@redhat.com> Gerrit-Reviewer: Allon Mureinik <amureini@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Freddy Rolland <frolland@redhat.com> Gerrit-Reviewer: Idan Shaby <ishaby@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Tal Nisan <tnisan@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>