0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1366 add getVirtualHostBasePath

Browse source
This commit is contained in:
Shinsuke Sugaya 2017-11-30 14:34:22 +09:00
parent eada090af2
commit 90a65b4a58
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/codelibs/fess/helper/SystemHelper.java
View file

@ -58,6 +58,7 @@ import org.codelibs.fess.util.ComponentUtil;
import org.codelibs.fess.validation.FessActionValidator;
import org.lastaflute.core.message.supplier.UserMessagesCreator;
import org.lastaflute.web.TypicalAction;
import org.lastaflute.web.response.next.HtmlNext;
import org.lastaflute.web.ruts.process.ActionRuntime;
import org.lastaflute.web.servlet.request.RequestManager;
import org.lastaflute.web.util.LaServletContextUtil;
@ -382,4 +383,8 @@ public class SystemHelper {
return new FessActionValidator<>(requestManager, messagesCreator, runtimeGroups);
}
public String getVirtualHostBasePath(final String s, final HtmlNext page) {
return StringUtil.isBlank(s) ? StringUtil.EMPTY : "/" + s;
}
}

2
src/main/java/org/codelibs/fess/mylasta/direction/FessProp.java
View file

@ -1618,7 +1618,7 @@ public interface FessProp {
public default HtmlNext getVirtualHostPath(final HtmlNext page) {
return processVirtualHost(s -> {
final String basePath = StringUtil.isBlank(s) ? StringUtil.EMPTY : "/" + s;
final String basePath = ComponentUtil.getSystemHelper().getVirtualHostBasePath(s, page);
return new HtmlNext(basePath + page.getRoutingPath());
}, page);
}