[Join-cvs] join1/src/web/jsp/environment deploymentshistory.jsp, NONE, 1.1 environmentmappings.jsp,
Brought to you by:
lbroudoux
Menu
▾
▴
[Join-cvs] join1/src/web/jsp/environment deploymentshistory.jsp, NONE, 1.1 environmentmappings.jsp, 1.1, 1.2 environmentview.jsp, 1.4, 1.5 environmentviews.jsp, 1.3, 1.4
|
From: Laurent B. <lbr...@us...> - 2008-01-28 00:40:55
|
Update of /cvsroot/join/join1/src/web/jsp/environment In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv22183/jsp/environment Modified Files: environmentmappings.jsp environmentview.jsp environmentviews.jsp Added Files: deploymentshistory.jsp Log Message: Fix for issue #1821986 : display deployments history Index: environmentmappings.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentmappings.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** environmentmappings.jsp 30 Jul 2006 19:39:16 -0000 1.1 --- environmentmappings.jsp 28 Jan 2008 00:40:52 -0000 1.2 *************** *** 1,4 **** --- 1,5 ---- <% // $Revision$ %> + <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 6,9 **** --- 7,14 ---- <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> + <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> + <div class="h3"> <h3> *************** *** 18,26 **** <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "logicalEnvKey=" + key %>" /> </logic:match> <logic:match name="criterion" value="physicalenv"> ! <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "physicalEnvKey=" + key %>" /> </logic:match> </span> --- 23,31 ---- <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "logicalEnvKey=" + key %>" /><br/> </logic:match> <logic:match name="criterion" value="physicalenv"> ! <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="name" scope="request"/> ! <bean:define id="param" toScope="page" value="<%= "physicalEnvKey=" + key %>" /><br/> </logic:match> </span> *************** *** 28,49 **** <div align="center"> <bean:define id="param" toScope="page" name="param"/> ! <display:table id="row" htmlId="doctab" name="requestScope.messages" export="true" ! requestURI="<%= "/action/environmentMapping?op=view&" + param %>" pagesize="20"> ! <display:column titleKey="label.envmapping.startdate" sortable="true"> ! <bean:write name="row" property="startDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <logic:match name="criterion" value="logicalenv"> ! <display:column titleKey="label.envmapping.physicalenv" property="physicalEnvironment.label"/> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <display:column titleKey="label.envmapping.logicalenv" property="logicalEnvironment.label"/> ! </logic:match> ! <display:column titleKey="label.envmapping.enddate"> ! <bean:write name="row" property="endDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! </display:table> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> ! <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </div> --- 33,62 ---- <div align="center"> <bean:define id="param" toScope="page" name="param"/> ! <ajax:displayTag id="adtFrame" tableClass="disptab"> ! <display:table id="row" styleClass="disptab" name="requestScope.mappings" export="true" ! requestURI="/action/environmentMapping?rd=none" pagesize="20"> ! <display:column titleKey="label.envmapping.startdate" width="120" sortable="true"> ! <bean:write name="row" property="startDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! <logic:match name="criterion" value="logicalenv"> ! <display:column titleKey="label.envmapping.physicalenv" property="physicalEnvironment.name"/> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <display:column titleKey="label.envmapping.logicalenv" property="logicalEnvironment.label"/> ! </logic:match> ! <display:column titleKey="label.envmapping.enddate"> ! <bean:write name="row" property="endDate" formatKey="pattern.date.datetostring"/> ! </display:column> ! </display:table> ! </ajax:displayTag> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> ! <logic:match name="criterion" value="logicalenv"> ! <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> ! </logic:match> ! <logic:match name="criterion" value="physicalenv"> ! <html:link action="/physicalEnvironment?op=details" paramId="idStr" paramName="environment" paramProperty="id"> ! <bean:message bundle="gui" key="menu.environments"/> ...</html:link> ! </logic:match> </div> Index: environmentviews.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentviews.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** environmentviews.jsp 8 Apr 2007 22:30:13 -0000 1.3 --- environmentviews.jsp 28 Jan 2008 00:40:52 -0000 1.4 *************** *** 97,103 **** <legend><html:img page="/images/16x16/history.gif" alt="History" align="absmiddle"/> <bean:message bundle="gui" key="label.logicalenv.history"/></legend> <br/> ! <html:link action="/deployment?op="><bean:message bundle="gui" key="label.logicalenv.history.currents"/></html:link><br/> <join:authorize role="manager" resourceName="element"> ! <html:link action="/deployment?op="><bean:message bundle="gui" key="label.logicalenv.history.logicalenv"/></html:link><br/> </join:authorize> <join:authorize role="joiner"> --- 97,107 ---- <legend><html:img page="/images/16x16/history.gif" alt="History" align="absmiddle"/> <bean:message bundle="gui" key="label.logicalenv.history"/></legend> <br/> ! <logic:present name="element" property="logicalEnvironment.activeEnvironmentMapping"> ! <html:link action="/deployments?op=getByEnvMapping" paramId="idStr" paramName="element" paramProperty="logicalEnvironment.activeEnvironmentMapping.id"> ! <bean:message bundle="gui" key="label.logicalenv.history.currents"/></html:link><br/> ! </logic:present> <join:authorize role="manager" resourceName="element"> ! <html:link action="/deployments?op=getByLogical" paramId="logicalEnvKey" paramName="element" paramProperty="logicalEnvironment.key"> ! <bean:message bundle="gui" key="label.logicalenv.history.logicalenv"/></html:link><br/> </join:authorize> <join:authorize role="joiner"> --- NEW FILE: deploymentshistory.jsp --- <% // $Revision: 1.1 $ %> <%@ taglib uri="/WEB-INF/join.tld" prefix="join" %> <%@ taglib uri="/WEB-INF/ajaxtags.tld" prefix="ajax" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <%@ taglib uri="/WEB-INF/displaytag-12.tld" prefix="display" %> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/prototype.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/scriptaculous.js"></script> <script type="text/javascript" src="<%=request.getContextPath()%>/scripts/ajaxtags.js"></script> <div class="h3"> <h3> <html:img page="/images/22x22/history.gif" align="absmiddle"/> <bean:message bundle="gui" name="title"/> </h3> </div> <br/> <div class="h4"> <h4><bean:message bundle="gui" key="title.deployments.searched"/></h4> <span class="text" id="doctab"> <logic:match name="criterion" value="logicalenv"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="environment" property="label" scope="request"/><br/> </logic:match> <logic:match name="criterion" value="physicalenv"> <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="environment" property="name" scope="request"/><br/> </logic:match> <logic:match name="criterion" value="envmapping"> <bean:message bundle="gui" key="label.envmapping.logicalenv"/> : <bean:write name="mapping" property="logicalEnvironment.label" scope="request"/><br/> <bean:message bundle="gui" key="label.envmapping.physicalenv"/> : <bean:write name="mapping" property="physicalEnvironment.name" scope="request"/><br/> <bean:message bundle="gui" key="label.envmapping.startdate"/> : <bean:write name="mapping" property="startDate" formatKey="pattern.date.datetostring"/><br/> <bean:message bundle="gui" key="label.envmapping.enddate"/> : <bean:write name="mapping" property="endDate" formatKey="pattern.date.datetostring"/><br/> </logic:match> </span> <br/> <div align="center"> <ajax:displayTag id="adtFrame" tableClass="disptab"> <display:table id="row" styleClass="disptab" name="requestScope.deployments" export="true" requestURI="/action/deployments?rd=none" pagesize="20"> <bean:define id="cancelled" name="row" property="status.cancelled"/> <display:column titleKey="label.deployment.realizationdate" width="120" sortable="true"> <logic:equal value="true" name="cancelled"><span class="canceled"></logic:equal> <bean:write name="row" property="realizationDate" formatKey="pattern.date.datetostring"/> <logic:equal value="true" name="cancelled"></span></logic:equal> </display:column> <display:column titleKey="label.deployment.assembly"> <logic:equal value="true" name="cancelled"><span class="canceled"></logic:equal> <html:link action="/assembly?op=details" paramId="key" paramName="row" paramProperty="assembly.key"> <bean:write name="row" property="assembly.key"/></html:link> <logic:equal value="true" name="cancelled"></span></logic:equal> </display:column> <display:column titleKey="label.deployment.target" property="target.name"/> <display:column titleKey="label.deployment.applicant"> <join:resolveUser name="row" property="applicantId" link="true"/> </display:column> </display:table> </ajax:displayTag> </div> <br/> <html:img page="/images/22x22/environment.gif" align="absmiddle"/> <logic:match name="criterion" value="logicalenv"> <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> <logic:match name="criterion" value="physicalenv"> <html:link action="/physicalEnvironment?op=details" paramId="idStr" paramName="environment" paramProperty="id"> <bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> <logic:match name="criterion" value="envmapping"> <html:link action="/logicalEnvironment?op=view"><bean:message bundle="gui" key="menu.environments"/> ...</html:link> </logic:match> </div> Index: environmentview.jsp =================================================================== RCS file: /cvsroot/join/join1/src/web/jsp/environment/environmentview.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** environmentview.jsp 8 Apr 2007 22:30:13 -0000 1.4 --- environmentview.jsp 28 Jan 2008 00:40:52 -0000 1.5 *************** *** 246,250 **** <br/> <logic:notEqual parameter="fromLogical" value="true"> ! <html:link action="/deployment?op=getByPhysical" paramId="environmentKey" paramName="environment" paramProperty="key"> <bean:message bundle="gui" key="label.physicalenv.history.updates"/></html:link> <br/><br/> --- 246,250 ---- <br/> <logic:notEqual parameter="fromLogical" value="true"> ! <html:link action="/deployments?op=getByPhysical" paramId="physicalEnvKey" paramName="environment" paramProperty="key"> <bean:message bundle="gui" key="label.physicalenv.history.updates"/></html:link> <br/><br/> |
Gen AI apps are built with MongoDB Atlas
Atlas offers built-in vector search and global availability across 125+ regions. Start building AI apps faster, all in one place.