geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r372286 - /geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
Date Wed, 25 Jan 2006 18:47:55 GMT
Author: ammulder
Date: Wed Jan 25 10:47:53 2006
New Revision: 372286

URL: http://svn.apache.org/viewcvs?rev=372286&view=rev
Log:
Merge fix for GERONIMO-1387 from branch

Modified:
    geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp

Modified: geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp?rev=372286&r1=372285&r2=372286&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
(original)
+++ geronimo/trunk/applications/console-standard/src/webapp/WEB-INF/view/configmanager/normal.jsp
Wed Jan 25 10:47:53 2006
@@ -23,7 +23,7 @@
         <td width="100" class="${backgroundClass}">&nbsp;${configInfo.state}</td>
         <td width="100" class="${backgroundClass}">
 <c:if test="${configInfo.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
-<c:if test="${configInfo.state.stopped}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
+<c:if test="${configInfo.state.stopped && (configInfo.type.name ne 'CAR')}">&nbsp;<a
href="<portlet:actionURL><portlet:param name="configId" value="${configInfo.configID}"/><portlet:param
name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
 <c:if test="${configInfo.state.failed}">&nbsp;<a href="<portlet:actionURL><portlet:param
name="configId" value="${configInfo.configID}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
         </td>
         <td width="100" class="${backgroundClass}">



Mime
View raw message