Return-Path: 
 <commits-return-5055-apmail-continuum-commits-archive=continuum.apache.org@continuum.apache.org>
Delivered-To: apmail-continuum-commits-archive@www.apache.org
Received: (qmail 90828 invoked from network); 17 Mar 2009 01:08:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Mar 2009 01:08:40 -0000
Received: (qmail 16610 invoked by uid 500); 17 Mar 2009 01:08:40 -0000
Delivered-To: apmail-continuum-commits-archive@continuum.apache.org
Received: (qmail 16574 invoked by uid 500); 17 Mar 2009 01:08:40 -0000
Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@continuum.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@continuum.apache.org>
List-Post: <mailto:commits@continuum.apache.org>
List-Id: <commits.continuum.apache.org>
Reply-To: dev@continuum.apache.org
Delivered-To: mailing list commits@continuum.apache.org
Received: (qmail 16565 invoked by uid 99); 17 Mar 2009 01:08:40 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Mar 2009 18:08:40 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Mar 2009 01:08:39 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EF2D7238898E; Tue, 17 Mar 2009 01:08:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r755063 -
 /continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/
Date: Tue, 17 Mar 2009 01:08:18 -0000
To: commits@continuum.apache.org
From: wsmoak@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090317010818.EF2D7238898E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: wsmoak
Date: Tue Mar 17 01:08:18 2009
New Revision: 755063

URL: http://svn.apache.org/viewvc?rev=755063&view=rev
Log:
[CONTINUUM-2130] Add conditional validation to check that both the email address and latest committers checkbox are not blank.
According to the docs [1] this should be a <validator> and not a <field-validator> but that didn't work at all.
Currently the validation is working and it will not let you save the form without either an address or the checkbox, however the error message does not display.

[1] http://struts.apache.org/2.0.14/struts2-core/apidocs/com/opensymphony/xwork2/validator/Validator.html

Modified:
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
    continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml?rev=755063&r1=755062&r2=755063&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction-mailProjectGroupNotifierSave-validation.xml Tue Mar 17 01:08:18 2009
@@ -23,6 +23,16 @@
 
 <validators>
   <field name="address">
+    <field-validator type="expression">
+      <param name="expression">
+        ! (
+          ( address eq "" )
+          and
+          ( committers eq "" )
+          )
+      </param>
+      <message key="mailNotifier.address.required"/>
+    </field-validator>
     <field-validator type="regex">
       <param name="expression"><![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
       <message key="mailNotifier.address.invalid"/>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties?rev=755063&r1=755062&r2=755063&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailGroupNotifierEditAction.properties Tue Mar 17 01:08:18 2009
@@ -17,5 +17,5 @@
 # under the License.
 #
 
-mailNotifier.address.required = Address is required
+mailNotifier.address.required = You must either provide an address, or select to notify latest committers.
 mailNotifier.address.invalid = Address is invalid

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml?rev=755063&r1=755062&r2=755063&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction-mailProjectNotifierSave-validation.xml Tue Mar 17 01:08:18 2009
@@ -23,6 +23,16 @@
 
 <validators>
   <field name="address">
+    <field-validator type="expression">
+     <param name="expression">
+        ! (
+          ( address eq "" )
+          and
+          ( committers eq "" )
+          )
+     </param>
+     <message key="mailNotifier.address.required"/>
+    </field-validator>
     <field-validator type="regex">
       <param name="expression"><![CDATA[(^[_A-Za-z0-9-\&]+[\&_A-Za-z0-9-+]*(\.[_A-Za-z0-9-+\&]+)*@([A-Za-z0-9-\&])+(\.[A-Za-z0-9-]+)*((\.[A-Za-z0-9]{2,})|(\.[A-Za-z0-9]{2,}\.[A-Za-z0-9]{2,}))$)]]></param>
       <message key="mailNotifier.address.invalid"/>

Modified: continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties?rev=755063&r1=755062&r2=755063&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties (original)
+++ continuum/trunk/continuum-webapp/src/main/resources/org/apache/maven/continuum/web/action/notifier/MailProjectNotifierEditAction.properties Tue Mar 17 01:08:18 2009
@@ -17,5 +17,5 @@
 # under the License.
 #
 
-mailNotifier.address.required = Address is required
+mailNotifier.address.required = You must either provide an address, or select to notify latest committers.
 mailNotifier.address.invalid = Address is invalid