You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2009/04/20 18:55:40 UTC
svn commit: r766753 -
/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Author: jmorales
Date: Mon Apr 20 16:55:39 2009
New Revision: 766753
URL: http://svn.apache.org/viewvc?rev=766753&view=rev
Log:
Related to issue CONTINUUM-2075.
Don't allow delete deault build definition in 'Project Information' tab.
Modified:
continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=766753&r1=766752&r2=766753&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Mon Apr 20 16:55:39 2009
@@ -110,13 +110,18 @@
</ww:if>
<ww:else>
<redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
- <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
- <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
- <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
- <ww:param name="groupBuildDefinition">true</ww:param>
- <ww:param name="confirmed" value="false"/>
- </ww:url>
- <ww:a href="%{removeUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+ <ww:if test="${pageScope.buildDefinitionSummary.isDefault == true}">
+ <img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0">
+ </ww:if>
+ <ww:else>
+ <ww:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+ <ww:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
+ <ww:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</ww:param>
+ <ww:param name="groupBuildDefinition">true</ww:param>
+ <ww:param name="confirmed" value="false"/>
+ </ww:url>
+ <ww:a href="%{removeUrl}"><img src="<ww:url value='/images/delete.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
+ </ww:else>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<ww:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text name='delete'/>" border="0" />
Re: svn commit: r766753 - /continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Posted by Brett Porter <br...@apache.org>.
On 21/04/2009, at 6:12 PM, José Morales Martínez wrote:
> Changed was merged to 1.3.x but I did not know that was closed for
> maintenance branch 1.2.x.
>
> Should I revert this change?
>
No need... I guess my question is in ther other mail about whether we
are doing a 1.2.4 or not :)
- Brett
RE: svn commit: r766753 -
/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Posted by José Morales Martínez <jm...@gmv.com>.
Changed was merged to 1.3.x but I did not know that was closed for maintenance branch 1.2.x.
Should I revert this change?
________________________________________
De: brett@porterclan.net [brett@porterclan.net] En nombre de Brett Porter [brett@apache.org]
Enviado el: martes, 21 de abril de 2009 3:08
Para: dev@continuum.apache.org
Asunto: Re: svn commit: r766753 - /continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Hi,
Are we still maintaining the 1.2.x branch? I thought the 1.2.3 release was
the last, except for a possible change to the data management - which may no
longer be needed.
Also, should this change be merged to trunk/1.3.x?
- Brett
______________________
Este mensaje, y en su caso, cualquier fichero anexo al mismo,
puede contener informacion clasificada por su emisor como confidencial
en el marco de su Sistema de Gestion de Seguridad de la
Informacion siendo para uso exclusivo del destinatario, quedando
prohibida su divulgacion copia o distribucion a terceros sin la
autorizacion expresa del remitente. Si Vd. ha recibido este mensaje
erroneamente, se ruega lo notifique al remitente y proceda a su borrado.
Gracias por su colaboracion.
______________________
This message including any attachments may contain confidential
information, according to our Information Security Management System,
and intended solely for a specific individual to whom they are addressed.
Any unauthorised copy, disclosure or distribution of this message
is strictly forbidden. If you have received this transmission in error,
please notify the sender immediately and delete it.
______________________
Re: svn commit: r766753 - /continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Posted by Brett Porter <br...@apache.org>.
Hi,
Are we still maintaining the 1.2.x branch? I thought the 1.2.3 release was
the last, except for a possible change to the data management - which may no
longer be needed.
Also, should this change be merged to trunk/1.3.x?
- Brett
2009/4/21 <jm...@apache.org>
> Author: jmorales
> Date: Mon Apr 20 16:55:39 2009
> New Revision: 766753
>
> URL: http://svn.apache.org/viewvc?rev=766753&view=rev
> Log:
> Related to issue CONTINUUM-2075.
>
> Don't allow delete deault build definition in 'Project Information' tab.
>
>
> Modified:
>
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
>
> Modified:
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=766753&r1=766752&r2=766753&view=diff
>
> ==============================================================================
> ---
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> (original)
> +++
> continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> Mon Apr 20 16:55:39 2009
> @@ -110,13 +110,18 @@
> </ww:if>
> <ww:else>
> <redback:ifAuthorized
> permission="continuum-remove-group-build-definition"
> resource="${projectGroupName}">
> - <ww:url id="removeUrl" action="removeGroupBuildDefinition"
> namespace="/">
> - <ww:param
> name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
> - <ww:param name="buildDefinitionId">${
> pageScope.buildDefinitionSummary.id}</ww:param>
> - <ww:param name="groupBuildDefinition">true</ww:param>
> - <ww:param name="confirmed" value="false"/>
> - </ww:url>
> - <ww:a href="%{removeUrl}"><img src="<ww:url
> value='/images/delete.gif' includeParams="none"/>" alt="<ww:text
> name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
> + <ww:if test="${pageScope.buildDefinitionSummary.isDefault ==
> true}">
> + <img src="<ww:url value='/images/delete_disabled.gif'
> includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text
> name='delete'/>" border="0">
> + </ww:if>
> + <ww:else>
> + <ww:url id="removeUrl" action="removeGroupBuildDefinition"
> namespace="/">
> + <ww:param
> name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</ww:param>
> + <ww:param name="buildDefinitionId">${
> pageScope.buildDefinitionSummary.id}</ww:param>
> + <ww:param name="groupBuildDefinition">true</ww:param>
> + <ww:param name="confirmed" value="false"/>
> + </ww:url>
> + <ww:a href="%{removeUrl}"><img src="<ww:url
> value='/images/delete.gif' includeParams="none"/>" alt="<ww:text
> name='delete'/>" title="<ww:text name='delete'/>" border="0"></ww:a>
> + </ww:else>
> </redback:ifAuthorized>
> <redback:elseAuthorized>
> <img src="<ww:url value='/images/delete_disabled.gif'
> includeParams="none"/>" alt="<ww:text name='delete'/>" title="<ww:text
> name='delete'/>" border="0" />
>
>
>
--
Brett Porter
http://blogs.exist.com/bporter/