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/21 17:06:43 UTC
svn commit: r767173 - in
/continuum/branches/continuum-1.3.x/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Author: jmorales
Date: Tue Apr 21 15:06:42 2009
New Revision: 767173
URL: http://svn.apache.org/viewvc?rev=767173&view=rev
Log:
Related to issue CONTINUUM-2075.
Don't allow delete default project group build definition in 'Project Information' tab. Disable delete for default project group build defintition.
Modified:
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=767173&r1=767172&r2=767173&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java Tue Apr 21 15:06:42 2009
@@ -49,6 +49,9 @@
private String projectGroupName;
private int projectId;
+
+ // Allow dont remove default group build definition in project list
+ private int defaultGroupDefinitionId;
private ProjectGroup projectGroup;
@@ -141,6 +144,9 @@
{
for ( BuildDefinitionSummary bds : groupBuildDefinitionSummaries )
{
+ if (bds.isIsDefault()){
+ defaultGroupDefinitionId = bds.getId();
+ }
bds.setIsDefault( false );
}
}
@@ -254,4 +260,9 @@
{
this.projectGroup = projectGroup;
}
+
+ public int getDefaultGroupDefinitionId()
+ {
+ return defaultGroupDefinitionId;
+ }
}
Modified: continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=767173&r1=767172&r2=767173&view=diff
==============================================================================
--- continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp (original)
+++ continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp Tue Apr 21 15:06:42 2009
@@ -113,13 +113,20 @@
</c:when>
<c:otherwise>
<redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}">
- <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
- <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
- <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
- <s:param name="groupBuildDefinition">true</s:param>
- <s:param name="confirmed" value="false"/>
- </s:url>
- <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
+ <c:choose>
+ <c:when test="${buildDefinitionSummary.id == defaultGroupDefinitionId}">
+ <img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
+ </c:when>
+ <c:otherwise>
+ <s:url id="removeUrl" action="removeGroupBuildDefinition" namespace="/">
+ <s:param name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
+ <s:param name="buildDefinitionId">${pageScope.buildDefinitionSummary.id}</s:param>
+ <s:param name="groupBuildDefinition">true</s:param>
+ <s:param name="confirmed" value="false"/>
+ </s:url>
+ <s:a href="%{removeUrl}"><img src="<s:url value='/images/delete.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
+ </c:otherwise>
+ </c:choose>
</redback:ifAuthorized>
<redback:elseAuthorized>
<img src="<s:url value='/images/delete_disabled.gif' includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text name='delete'/>" border="0" />
RE: svn commit: r767173 - in
/continuum/branches/continuum-1.3.x/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Posted by José Morales MartÃnez <jm...@gmv.com>.
Ok . I take note.
I will use merge notation and [ ] notation.
________________________________________
De: Emmanuel Venisse [emmanuel.venisse@gmail.com]
Enviado el: martes, 21 de abril de 2009 17:36
Para: dev@continuum.apache.org
Asunto: Re: svn commit: r767173 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Please use our merge notation "merge -r 766894:766895 from branchname"Thanks
Emmanuel
______________________
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: r767173 - in /continuum/branches/continuum-1.3.x/continuum-webapp/src/main:
java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Posted by Emmanuel Venisse <em...@gmail.com>.
Please use our merge notation "merge -r 766894:766895 from branchname"Thanks
Emmanuel
On Tue, Apr 21, 2009 at 5:06 PM, <jm...@apache.org> wrote:
> Author: jmorales
> Date: Tue Apr 21 15:06:42 2009
> New Revision: 767173
>
> URL: http://svn.apache.org/viewvc?rev=767173&view=rev
> Log:
> Related to issue CONTINUUM-2075.
>
> Don't allow delete default project group build definition in 'Project
> Information' tab. Disable delete for default project group build
> defintition.
>
>
> Modified:
>
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
>
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
>
> Modified:
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
> URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=767173&r1=767172&r2=767173&view=diff
>
> ==============================================================================
> ---
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
> (original)
> +++
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
> Tue Apr 21 15:06:42 2009
> @@ -49,6 +49,9 @@
> private String projectGroupName;
>
> private int projectId;
> +
> + // Allow dont remove default group build definition in project list
> + private int defaultGroupDefinitionId;
>
> private ProjectGroup projectGroup;
>
> @@ -141,6 +144,9 @@
> {
> for ( BuildDefinitionSummary bds :
> groupBuildDefinitionSummaries )
> {
> + if (bds.isIsDefault()){
> + defaultGroupDefinitionId = bds.getId();
> + }
> bds.setIsDefault( false );
> }
> }
> @@ -254,4 +260,9 @@
> {
> this.projectGroup = projectGroup;
> }
> +
> + public int getDefaultGroupDefinitionId()
> + {
> + return defaultGroupDefinitionId;
> + }
> }
>
> Modified:
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> URL:
> http://svn.apache.org/viewvc/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp?rev=767173&r1=767172&r2=767173&view=diff
>
> ==============================================================================
> ---
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> (original)
> +++
> continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
> Tue Apr 21 15:06:42 2009
> @@ -113,13 +113,20 @@
> </c:when>
> <c:otherwise>
> <redback:ifAuthorized
> permission="continuum-remove-group-build-definition"
> resource="${projectGroupName}">
> - <s:url id="removeUrl" action="removeGroupBuildDefinition"
> namespace="/">
> - <s:param
> name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
> - <s:param name="buildDefinitionId">${
> pageScope.buildDefinitionSummary.id}</s:param>
> - <s:param name="groupBuildDefinition">true</s:param>
> - <s:param name="confirmed" value="false"/>
> - </s:url>
> - <s:a href="%{removeUrl}"><img src="<s:url
> value='/images/delete.gif' includeParams="none"/>" alt="<s:text
> name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
> + <c:choose>
> + <c:when test="${buildDefinitionSummary.id ==
> defaultGroupDefinitionId}">
> + <img src="<s:url value='/images/delete_disabled.gif'
> includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text
> name='delete'/>" border="0" />
> + </c:when>
> + <c:otherwise>
> + <s:url id="removeUrl"
> action="removeGroupBuildDefinition" namespace="/">
> + <s:param
> name="projectGroupId">${pageScope.buildDefinitionSummary.projectGroupId}</s:param>
> + <s:param name="buildDefinitionId">${
> pageScope.buildDefinitionSummary.id}</s:param>
> + <s:param name="groupBuildDefinition">true</s:param>
> + <s:param name="confirmed" value="false"/>
> + </s:url>
> + <s:a href="%{removeUrl}"><img src="<s:url
> value='/images/delete.gif' includeParams="none"/>" alt="<s:text
> name='delete'/>" title="<s:text name='delete'/>" border="0"></s:a>
> + </c:otherwise>
> + </c:choose>
> </redback:ifAuthorized>
> <redback:elseAuthorized>
> <img src="<s:url value='/images/delete_disabled.gif'
> includeParams="none"/>" alt="<s:text name='delete'/>" title="<s:text
> name='delete'/>" border="0" />
>
>
>