[Aplaws-commit] r1077 - contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui

[<ssk...@vh...>]

Author: sskracic
Date: 2006-01-13 15:49:01 +0100 (Fri, 13 Jan 2006)
New Revision: 1077

Modified:
   contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAlertForm.java
Log:
  Email address is mandatory.  In case of having mod_proxy frontend,
URL retrieved with URL.here(Web.getRequest(),...) might be incorrect.


Modified: contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAlertForm.java
===================================================================
--- contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAlertForm.java	2006-01-13 14:47:04 UTC (rev 1076)
+++ contrib/ccm-ldn-camden-consultation/trunk/src/com/arsdigita/camden/cms/contenttypes/ui/ConsultationAlertForm.java	2006-01-13 14:49:01 UTC (rev 1077)
@@ -32,6 +32,7 @@
 import com.arsdigita.bebop.form.Submit;
 import com.arsdigita.bebop.form.Widget;
 import com.arsdigita.bebop.parameters.EmailValidationListener;
+import com.arsdigita.bebop.parameters.NotNullValidationListener;
 import com.arsdigita.bebop.parameters.ParameterData;
 import com.arsdigita.camden.cms.contenttypes.ConsultationAlert;
 import com.arsdigita.camden.cms.contenttypes.ConsultationUtil;
@@ -134,6 +135,7 @@
             }
           });
 
+        m_email.addValidationListener(new NotNullValidationListener());
         m_email.addValidationListener(new ParameterListener() {
 
             private EmailValidationListener m_emailValidation =
@@ -304,8 +306,9 @@
                 alert.getConfirmationToken());
 
         String confirmationURL =
-            URL.here(Web.getRequest(),
-                    ConsultationAlert.CONFIRM_PATH, parameters).getURL();
+            URL.there(Web.getContext().getApplication(),
+                      ConsultationAlert.CONFIRM_PATH,
+                      parameters).getURL();
 
         String num = alert.getMobileNumber();
         String[] args = {email, systemURL, confirmationURL, num};