| commit | d18bc8b24d8287fc452540ae277386036d476f44 | [log] [tgz] |
|---|---|---|
| author | Jose Morales Martinez <jmorales@apache.org> | Tue Apr 21 15:24:17 2009 +0000 |
| committer | Jose Morales Martinez <jmorales@apache.org> | Tue Apr 21 15:24:17 2009 +0000 |
| tree | c57100a9b733bd48cff43e0100a77c0b5fffb613 | |
| parent | e1b306d2f650acc6eba6dc626f139ebe9ea910a8 [diff] |
Related to issue CONTINUUM-2075. Solve this bug although I don't know if will have version 1.2.4. git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/continuum-1.2.x@767186 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java b/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java index d1090e7..7fa2d03 100644 --- a/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java +++ b/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
@@ -46,6 +46,9 @@ private String projectGroupName; private int projectId; + + // Allow dont remove default group build definition in project list + private int defaultGroupDefinitionId; private ProjectGroup projectGroup; @@ -139,6 +142,9 @@ { for ( BuildDefinitionSummary bds : groupBuildDefinitionSummaries ) { + if (bds.isIsDefault()){ + defaultGroupDefinitionId = bds.getId(); + } bds.setIsDefault( false ); } } @@ -253,4 +259,9 @@ { this.projectGroup = projectGroup; } + + public int getDefaultGroupDefinitionId() + { + return defaultGroupDefinitionId; + } }
diff --git a/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp b/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp index ef2d008..6ac5557 100644 --- a/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp +++ b/continuum-webapp/src/main/webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
@@ -110,7 +110,7 @@ </ww:if> <ww:else> <redback:ifAuthorized permission="continuum-remove-group-build-definition" resource="${projectGroupName}"> - <ww:if test="${pageScope.buildDefinitionSummary.isDefault == true}"> + <ww:if test="${buildDefinitionSummary.id == defaultGroupDefinitionId || 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>