continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r662594 - in /continuum/trunk/continuum-webapp/src/main: java/org/apache/maven/continuum/web/action/admin/InstallationAction.java webapp/WEB-INF/jsp/admin/editInstallation.jsp
Date Mon, 02 Jun 2008 22:43:17 GMT
Author: olamy
Date: Mon Jun  2 15:43:16 2008
New Revision: 662594

URL: http://svn.apache.org/viewvc?rev=662594&view=rev
Log:
[CONTINUUM-1623] Checkbox not displaying when validation error in add Instalaction->Tool
form
Submitted by Jevica Arianne B. Zurbano 
Patch with modification


Modified:
    continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp

Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java?rev=662594&r1=662593&r2=662594&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
(original)
+++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/admin/InstallationAction.java
Mon Jun  2 15:43:16 2008
@@ -73,6 +73,8 @@
     private Map<String, String> installationTypes;
     
     private static final String TOOL_TYPE_KEY = "tool";
+    
+    private boolean automaticProfileDisplayable = true;
    
     // -----------------------------------------------------
     // Webwork methods
@@ -94,6 +96,7 @@
         {
             this.configureUiFlags();
         }
+        this.automaticProfileDisplayable = false;
         return SUCCESS;
     }
 
@@ -330,4 +333,14 @@
         this.installationType = installationType;
     }
 
+    public boolean isAutomaticProfileDisplayable()
+    {
+        return automaticProfileDisplayable;
+    }
+
+    public void setAutomaticProfileDisplayable( boolean automaticProfileDisplayable )
+    {
+        this.automaticProfileDisplayable = automaticProfileDisplayable;
+    }    
+    
 }

Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp?rev=662594&r1=662593&r2=662594&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
(original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editInstallation.jsp
Mon Jun  2 15:43:16 2008
@@ -65,7 +65,7 @@
             </ww:else>
             <ww:textfield label="%{getText('installation.value.label')}" name="installation.varValue"
                           required="true"/>
-            <ww:if test="installation == null">
+            <ww:if test="(automaticProfileDisplayable && installation == null)
||  (installation.installationId == 0)">
               <ww:checkbox label="%{getText('installation.automaticProfile.label')}" name="automaticProfile"
/>
             </ww:if>
           </tbody>



Mime
View raw message