minor bug fixed
This commit is contained in:
parent
fec03f47de
commit
cc9f8f479f
|
@ -68,6 +68,7 @@ public class PortletViewController {
|
||||||
model.addAttribute("releaseInfo", ReleaseInfo.getReleaseInfo());
|
model.addAttribute("releaseInfo", ReleaseInfo.getReleaseInfo());
|
||||||
PortletPreferences prefs = request.getPreferences();
|
PortletPreferences prefs = request.getPreferences();
|
||||||
String catalogueBaseURL = GetterUtil.getString(prefs.getValue("catalogueURL", StringPool.BLANK));
|
String catalogueBaseURL = GetterUtil.getString(prefs.getValue("catalogueURL", StringPool.BLANK));
|
||||||
|
model.addAttribute("catalogueActualURL", catalogueBaseURL);
|
||||||
HttpServletRequest httpServletRequest = PortalUtil.getHttpServletRequest(request);
|
HttpServletRequest httpServletRequest = PortalUtil.getHttpServletRequest(request);
|
||||||
long groupId = -1;
|
long groupId = -1;
|
||||||
boolean isRootVO = false;
|
boolean isRootVO = false;
|
||||||
|
|
|
@ -5,17 +5,12 @@
|
||||||
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
|
<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %>
|
||||||
<%@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %>
|
<%@ taglib uri="http://liferay.com/tld/portlet" prefix="liferay-portlet" %>
|
||||||
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
|
<%@ taglib uri="http://liferay.com/tld/theme" prefix="liferay-theme" %>
|
||||||
<%@ page import="javax.portlet.PortletPreferences" %>
|
|
||||||
<%@ page import="com.liferay.portal.kernel.util.Constants" %>
|
<%@ page import="com.liferay.portal.kernel.util.Constants" %>
|
||||||
<%@ page import="com.liferay.portal.kernel.util.GetterUtil" %>
|
<%@ page import="com.liferay.portal.kernel.util.GetterUtil" %>
|
||||||
<%@ page import="com.liferay.portal.kernel.util.StringPool" %>
|
<%@ page import="com.liferay.portal.kernel.util.StringPool" %>
|
||||||
<%@ page import="com.liferay.portal.util.PortalUtil" %>
|
<%@ page import="com.liferay.portal.util.PortalUtil" %>
|
||||||
|
|
||||||
<%
|
|
||||||
PortletPreferences prefs = request.getPreferences();
|
|
||||||
String catalogueActualURL = GetterUtil.getString(prefs.getValue("catalogueURL", StringPool.BLANK));
|
|
||||||
pageContext.setAttribute("catalogueActualURL", catalogueActualURL);
|
|
||||||
%>
|
|
||||||
<!-- show the types only when the ckan instance is specified in the config portlet part -->
|
<!-- show the types only when the ckan instance is specified in the config portlet part -->
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${not empty catalogueActualURL}">
|
<c:when test="${not empty catalogueActualURL}">
|
||||||
|
|
Loading…
Reference in New Issue