You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ol...@apache.org on 2008/07/25 02:16:07 UTC

svn commit: r679626 - in /continuum/branches/CONTINUUM-782/continuum-webapp/src/main: java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp

Author: olamy
Date: Thu Jul 24 17:16:06 2008
New Revision: 679626

URL: http://svn.apache.org/viewvc?rev=679626&view=rev
Log:
capability to configure default flag

Modified:
    continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
    continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp

Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java?rev=679626&r1=679625&r2=679626&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/PurgeConfigurationAction.java Thu Jul 24 17:16:06 2008
@@ -163,7 +163,7 @@
             if ( purgeConfig instanceof RepositoryPurgeConfiguration )
             {
                 RepositoryPurgeConfiguration repoPurge = (RepositoryPurgeConfiguration) purgeConfig;
-                
+
                 this.purgeType = PURGE_TYPE_REPOSITORY;
                 this.daysOlder = repoPurge.getDaysOlder();
                 this.retentionCount = repoPurge.getRetentionCount();

Modified: continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=679626&r1=679625&r2=679626&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp (original)
+++ continuum/branches/CONTINUUM-782/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp Thu Jul 24 17:16:06 2008
@@ -56,15 +56,7 @@
             <c:if test="${purgeType == 'repository'}">
               <ww:checkbox label="%{getText('purgeConfig.deleteReleasedSnapshots.label')}" name="deleteReleasedSnapshots"/>
             </c:if>
-            <c:choose>
-              <c:when test="${defaultPurgeConfiguration == true}">
-                <ww:hidden name="defaultPurgeConfiguration"/>
-                <ww:label label="%{getText('purgeConfig.defaultPurge.label')}" value="true"/>
-              </c:when>
-              <c:otherwise>
-                <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
-              </c:otherwise>
-            </c:choose>
+            <ww:checkbox label="%{getText('purgeConfig.defaultPurge.label')}" name="defaultPurgeConfiguration" value="defaultPurgeConfiguration" fieldValue="true"/>
             <ww:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId" list="schedules"
                        headerKey="-1" headerValue=""/>
             <ww:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>