svn commit: r1479954 - in /openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth: SignInDialog.java SignInPage.java

[solomax]

Author: solomax
Date: Tue May  7 15:55:22 2013
New Revision: 1479954

URL: http://svn.apache.org/r1479954
Log:
[OPENMEETINGS-620] Registration dialog is better hidden if disabled;

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

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1479954&r1=1479953&r2=1479954&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
 Tue May  7 15:55:22 2013
@@ -18,13 +18,11 @@
  */
 package org.apache.openmeetings.web.pages.auth;
 
-import static 
org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
-import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.pages.auth.SignInPage.allowRegister;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.web.app.Application;
 import org.apache.openmeetings.web.app.WebSession;
 import org.apache.wicket.RestartResponseException;
@@ -96,7 +94,7 @@ public class SignInDialog extends Abstra
        @Override
        protected List<DialogButton> getButtons() {
                List<DialogButton> list = new ArrayList<DialogButton>();
-               if 
("1".equals(getBean(ConfigurationDao.class).getConfValue(FRONTEND_REGISTER_KEY, 
String.class, "0"))) {
+               if (allowRegister()) {
                        list.add(registerBtn);
                }
                list.add(loginBtn);

Modified: 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1479954&r1=1479953&r2=1479954&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
 Tue May  7 15:55:22 2013
@@ -18,6 +18,10 @@
  */
 package org.apache.openmeetings.web.pages.auth;
 
+import static 
org.apache.openmeetings.persistence.beans.basic.Configuration.FRONTEND_REGISTER_KEY;
+import static org.apache.openmeetings.web.app.Application.getBean;
+
+import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
 import org.apache.openmeetings.web.pages.BasePage;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -27,6 +31,10 @@ public class SignInPage extends BasePage
        private static final long serialVersionUID = -3843571657066167592L;
        private SignInDialog d;
        
+       static boolean allowRegister() {
+               return 
"1".equals(getBean(ConfigurationDao.class).getConfValue(FRONTEND_REGISTER_KEY, 
String.class, "0"));
+       }
+       
        public SignInPage(PageParameters p) {
                this();
        }
@@ -36,7 +44,7 @@ public class SignInPage extends BasePage
                d = new SignInDialog("signin");
                d.setRegisterDialog(r);
                r.setSignInDialog(d);
-               add(d, r);
+               add(d, r.setVisible(allowRegister()));
        }
        
        @Override