svn commit: r1509537 - /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

[vdegtyarev]

Author: vdegtyarev
Date: Fri Aug  2 04:38:11 2013
New Revision: 1509537

URL: http://svn.apache.org/r1509537
Log:
OPENMEETINGS-725 : correct confirmation for newly registered users.

Modified:
    
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1509537&r1=1509536&r2=1509537&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
 Fri Aug  2 04:38:11 2013
@@ -89,7 +89,8 @@ public class RegisterDialog extends Abst
     private FieldLanguage lang;
 
     final MessageDialog confirmRegistration;
-
+    private boolean sendConfirmation = false;
+    
        public RegisterDialog(String id) {
                super(id, WebSession.getString(113));
                add(form = new RegisterForm("form"));
@@ -106,6 +107,10 @@ public class RegisterDialog extends Abst
                                behavior.setOption("closeOnEscape", false);
                        }
                        
+                       public void onOpen(AjaxRequestTarget target) {
+                               this.setTitle(Model.of(sendConfirmation ? 
WebSession.getString(674) : WebSession.getString(236)));
+                       }
+                       
                        public void onClose(AjaxRequestTarget target, 
DialogButton button) {
                                s.open(target);
                        }
@@ -166,7 +171,7 @@ public class RegisterDialog extends Abst
                String redirectPage = 
getRequestCycle().urlFor(ActivatePage.class, new PageParameters().add("u", 
hash)).toString().substring(1);
                String baseURL = WebSession.get().getBaseUrl() + redirectPage;
                
-               boolean sendConfirmation = baseURL != null
+               sendConfirmation = baseURL != null
                                && !baseURL.isEmpty()
                                && 1 == 
getBean(ConfigurationDao.class).getConfValue(
                                                "sendEmailWithVerficationCode", 
Integer.class, "0");