#10370: Fix the UI - Undeploy - option not showing when deploy folder…

… is not named "load". (#11758)
dotCMS · May 30, 2017 · c276fb4 · c276fb4
1 parent 9a7c7c6
commit c276fb4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/dotCMS/src/main/webapp/html/portlet/ext/osgi/bundles.jsp b/dotCMS/src/main/webapp/html/portlet/ext/osgi/bundles.jsp
@@ -7,6 +7,7 @@
 <%@ page import="com.dotcms.publisher.endpoint.bean.PublishingEndPoint" %>
 <%@ page import="com.dotmarketing.util.UtilMethods" %>
 <%@ page import="org.osgi.framework.Bundle" %>
+<%@ page import="com.dotmarketing.util.OSGIUtil" %>
 <%        
 	request.setAttribute("requiredPortletAccess", "dynamic-plugins"); 
 %>
@@ -35,6 +36,7 @@
     %>
     var sendingEndpoints = <%=UtilMethods.isSet(sendingEndpoints) && !sendingEndpoints.isEmpty()%>;
 
+    var deployPath = '<%=OSGIUtil.getInstance().getFelixDeployPath()%>';
 </script>
 
 <div class="buttonBoxLeft">
@@ -176,14 +178,14 @@
                         if (bundleData.state == <%=Bundle.ACTIVE%>) {
                             htmlContent += "<a href=\"javascript:bundles.stop('" + bundleData.jarFile + "','" + bundleData.bundleId + "')\"><%=LanguageUtil.get(pageContext, "OSGI-Stop")%></a>";
                         }
-                        if (bundleData.location.indexOf(bundleData.separator) != -1 && bundleData.location.indexOf(bundleData.separator + "load" + bundleData.separator) != -1) {
+                        if (bundleData.location.indexOf(bundleData.separator) != -1 && bundleData.location.indexOf(deployPath + bundleData.separator) != -1) {
                             htmlContent += "&nbsp;|&nbsp;<a href=\"javascript:bundles.undeploy('" + bundleData.jarFile + "','" + bundleData.bundleId + "')\"><%=LanguageUtil.get(pageContext, "OSGI-Undeploy")%></a>";
                         }
                         htmlContent += "</td></tr>";
 
                         dojo.place(htmlContent, "bundlesTable-body", "after");
 
-                        if (bundleData.location.indexOf(bundleData.separator) != -1 && bundleData.location.indexOf(bundleData.separator + "load" + bundleData.separator) != -1) {
+                        if (bundleData.location.indexOf(bundleData.separator) != -1 && bundleData.location.indexOf(deployPath + bundleData.separator) != -1) {
                             if(enterprise) {
                                 popupMenus += "<div dojoType=\"dijit.Menu\" class=\"dotContextMenu\" id=\"popupTr" + (i++) +"\" contextMenuForWindow=\"false\" style=\"display: none;\" targetNodeIds=\"tr" + bundleData.jarFile + "\">";
                                 if (sendingEndpoints) {