You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/03/03 10:23:40 UTC
[isis] branch master updated: ISIS-1172 prepend context-path if any
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new c83b160 ISIS-1172 prepend context-path if any
c83b160 is described below
commit c83b160ba6f989dee40731f5143e1dececd24d1c
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 3 11:23:38 2018 +0100
ISIS-1172 prepend context-path if any
---
.../isis/viewer/wicket/ui/components/widgets/navbar/Placement.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
index 498c24f..5c1148f 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/navbar/Placement.java
@@ -18,11 +18,16 @@
*/
package org.apache.isis.viewer.wicket.ui.components.widgets.navbar;
+import org.apache.isis.applib.internal.resources._Resource;
+
public enum Placement {
HEADER,
SIGNIN;
String urlFor(final String logoHeaderUrl, final String logoSigninUrl) {
- return this == Placement.HEADER? logoHeaderUrl: logoSigninUrl;
+ return this == Placement.HEADER
+ ? _Resource.prependContextPathIfPresent(logoHeaderUrl)
+ : _Resource.prependContextPathIfPresent(logoSigninUrl)
+ ;
}
}
--
To stop receiving notification emails like this one, please contact
ahuber@apache.org.