Vojtech Szocs has submitted this change and it was merged. Change subject: userportal: Guide link doesn't work [ERROR 404] (#809738) ...................................................................... userportal: Guide link doesn't work [ERROR 404] (#809738) https://bugzilla.redhat.com/809738 The problem was, that the link to the documentation was hard coded. Changed to be the same as in WebAdmin, which means: - at the start of the application the server call is issued (AsyncDataProvider.GetDocumentationBaseURL) in the Configurator.updateDocumentationBaseURL(). This reads the DocsURL field from the vdc_options table. If it is set, the documentation URL is composed like this: <module base URL without module name>/<base url>/<lang>/ User_Portal_Guide/index.html This patch contains the following refactorings: - The UserPortalConfigurator and WebAdminConfigurator had quite a lot of logic copy-pasted. It has been extracted to the parent Configurator class - The logic which handles the guide link is the same for web admin and user portal - extracted to newly created class AbstractHeaderPresenterWidget Change-Id: I2f1413c4368e983285917525d9c3e881f73f2cdd Signed-off-by: Tomas Jelinek <tjelinek@redhat.com> --- A frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/presenter/main/AbstractHeaderPresenterWidget.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/Configurator.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/Model.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/ISpice.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationConstants.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/presenter/HeaderPresenterWidget.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/section/main/view/HeaderView.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/uicommon/UserPortalConfigurator.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/presenter/HeaderPresenterWidget.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/HeaderView.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/uicommon/WebAdminConfigurator.java 12 files changed, 403 insertions(+), 473 deletions(-) Approvals: Vojtech Szocs: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/4507 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2f1413c4368e983285917525d9c3e881f73f2cdd Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: Daniel Erez <derez@redhat.com> Gerrit-Reviewer: Tomas Jelinek <tjelinek@redhat.com> Gerrit-Reviewer: Vojtech Szocs <vszocs@redhat.com>