continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r541623 - in /maven/continuum/trunk/continuum-webapp/src/main: resources/org/apache/maven/continuum/web/action/ webapp/WEB-INF/jsp/
Date Fri, 25 May 2007 12:10:50 GMT
Author: evenisse
Date: Fri May 25 05:10:49 2007
New Revision: 541623

URL: http://svn.apache.org/viewvc?view=rev&rev=541623
Log:
[CONTINUUM-1293] moved the "hidden element" after the table such that "validation.js" can
execute correctly. [CONTINUUM-1294] Don't accept spaces in required fields
Submitted by: jan ancajas

Modified:
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
    maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/scheduleAction.properties
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction-addProject-validation.xml
Fri May 25 05:10:49 2007
@@ -23,17 +23,17 @@
 
 <validators>
   <field name="projectName">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="addProject.name.required"/>
     </field-validator>
   </field>
   <field name="projectVersion">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="addProject.version.required"/>
     </field-validator>
   </field>
   <field name="projectScmUrl">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="addProject.scmUrl.required"/>
     </field-validator>
   </field>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/AddProjectAction.properties
Fri May 25 05:10:49 2007
@@ -17,6 +17,6 @@
 # under the License.
 #
 
-addProject.name.required = Name is required
-addProject.version.required = Version is required
-addProject.scmUrl.required = SCM Url is required
+addProject.name.required = Name is required and cannot contain spaces only
+addProject.version.required = Version is required and cannot contain spaces only
+addProject.scmUrl.required = SCM Url is required and cannot contain spaces only

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/ScheduleAction-saveSchedule-validation.xml
Fri May 25 05:10:49 2007
@@ -23,12 +23,12 @@
 
 <validators>
   <field name="name">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="schedule.name.required"/>
     </field-validator>
   </field>
   <field name="description">
-    <field-validator type="required">
+    <field-validator type="requiredstring">
       <message key="schedule.version.required"/>
     </field-validator>
   </field>

Modified: maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/scheduleAction.properties
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/scheduleAction.properties?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/scheduleAction.properties
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/scheduleAction.properties
Fri May 25 05:10:49 2007
@@ -17,8 +17,8 @@
 # under the License.
 #
 
-schedule.name.required = Name is required
-schedule.version.required = Description is required
+schedule.name.required = Name is required and cannot contain spaces only
+schedule.version.required = Description is required and cannot contain spaces only
 schedule.maxJobExecutionTime.required = Maximum job execution time is required
 schedule.maxJobExecutionTime.invalid = Maximum job execution time must be an integer
 schedule.delay.invalid = Quiet period must be an integer 

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/addProject.jsp Fri
May 25 05:10:49 2007
@@ -52,7 +52,6 @@
                             </c:forEach>
                           </div>
                         </c:if>
-                        <input type="hidden" name="projectType" value="<ww:property
value="projectType"/>">
                         <table>
                           <tbody>
                             <ww:textfield label="%{getText('projectName.label')}" name="projectName"
required="true">
@@ -84,6 +83,7 @@
                             </ww:else>
                           </tbody>
                         </table>
+                        <input type="hidden" name="projectType" value="<ww:property
value="projectType"/>">
                         <div class="functnbar3">
                           <c1:submitcancel value="%{getText('add')}" cancel="%{getText('cancel')}"/>
                         </div>

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp?view=diff&rev=541623&r1=541622&r2=541623
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp (original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/editSchedule.jsp Fri
May 25 05:10:49 2007
@@ -39,7 +39,7 @@
             </c:forEach>
           </div>
         </c:if>
-        <ww:hidden name="id"/>
+
           <table>
             <ww:textfield label="%{getText('schedule.name.label')}" name="name" required="true">
                 <ww:param name="desc"><p><ww:text name="schedule.name.message"/></p></ww:param>
@@ -75,7 +75,7 @@
                 <ww:param name="desc"><p><ww:text name="schedule.enabled.message"/></p></ww:param>
             </ww:checkbox>
           </table>
-
+          <ww:hidden name="id"/>
         <div class="functnbar3">
           <c1:submitcancel value="%{getText('save')}" cancel="%{getText('cancel')}"/>
         </div>



Mime
View raw message