continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmora...@apache.org
Subject svn commit: r767186 - in /continuum/branches/continuum-1.2.x/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java webapp/WEB-INF/jsp/components/buildDefinitionSummaryComponent.jsp
Date Tue, 21 Apr 2009 15:24:18 GMT
Author: jmorales
Date: Tue Apr 21 15:24:17 2009
New Revision: 767186

URL: http://svn.apache.org/viewvc?rev=767186&view=rev
Log:
Related to issue CONTINUUM-2075.  Solve this bug although I don't know if will have version
1.2.4.


Modified:
    continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
    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/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java?rev=767186&r1=767185&r2=767186&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
(original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/component/BuildDefinitionSummaryAction.java
Tue Apr 21 15:24:17 2009
@@ -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;
+    }
 }

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=767186&r1=767185&r2=767186&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
Tue Apr 21 15:24:17 2009
@@ -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> 



Mime
View raw message