svn commit: r1758706 - in /openmeetings/application: branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java

[solomax]

Author: solomax
Date: Thu Sep  1 05:44:18 2016
New Revision: 1758706

URL: http://svn.apache.org/viewvc?rev=1758706&view=rev
Log:
[OPENMEETINGS-1458] dialog behavior is fixed

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1758706&r1=1758705&r2=1758706&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
 Thu Sep  1 05:44:18 2016
@@ -53,8 +53,10 @@ public class NicknameDialog extends Abst
                super(id, Application.getString(1287));
                this.room = room;
                User u = room.getClient().getUser();
-               u.setFirstname(Application.getString(433));
-               u.setLastname(String.format("%s %s", u.getFirstname(), 
TIME_DF.format(new Date())));
+               if (isVisible(u)) {
+                       u.setFirstname(Application.getString(433));
+                       u.setLastname(String.format("%s %s", u.getFirstname(), 
TIME_DF.format(new Date())));
+               }
                add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
                form.add(feedback);
                form.add(new 
RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4)));
@@ -62,11 +64,14 @@ public class NicknameDialog extends Abst
                form.add(new 
RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString(137))).add(RfcCompliantEmailAddressValidator.getInstance()));
        }
 
+       private static boolean isVisible(User u) {
+               return User.Type.external == u.getType() && 
Strings.isEmpty(u.getFirstname()) && Strings.isEmpty(u.getLastname());
+       }
+       
        @Override
        public void onConfigure(JQueryBehavior behavior) {
                super.onConfigure(behavior);
-               User u = form.getModelObject();
-               behavior.setOption("autoOpen", User.Type.external == 
u.getType() && Strings.isEmpty(u.getFirstname()) && 
Strings.isEmpty(u.getLastname()));
+               behavior.setOption("autoOpen", 
isVisible(form.getModelObject()));
                behavior.setOption("closeOnEscape", false);
                behavior.setOption("dialogClass", Options.asString("no-close"));
                behavior.setOption("resizable", false);

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java?rev=1758706&r1=1758705&r2=1758706&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
 Thu Sep  1 05:44:18 2016
@@ -53,8 +53,10 @@ public class NicknameDialog extends Abst
                super(id, Application.getString(1287));
                this.room = room;
                User u = room.getClient().getUser();
-               u.setFirstname(Application.getString(433));
-               u.setLastname(String.format("%s %s", u.getFirstname(), 
TIME_DF.format(new Date())));
+               if (isVisible(u)) {
+                       u.setFirstname(Application.getString(433));
+                       u.setLastname(String.format("%s %s", u.getFirstname(), 
TIME_DF.format(new Date())));
+               }
                add(form = new Form<>("form", new CompoundPropertyModel<>(u)));
                form.add(feedback);
                form.add(new 
RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString(135))).add(minimumLength(4)));
@@ -62,11 +64,14 @@ public class NicknameDialog extends Abst
                form.add(new 
RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString(137))).add(RfcCompliantEmailAddressValidator.getInstance()));
        }
 
+       private static boolean isVisible(User u) {
+               return User.Type.external == u.getType() && 
Strings.isEmpty(u.getFirstname()) && Strings.isEmpty(u.getLastname());
+       }
+       
        @Override
        public void onConfigure(JQueryBehavior behavior) {
                super.onConfigure(behavior);
-               User u = form.getModelObject();
-               behavior.setOption("autoOpen", User.Type.external == 
u.getType() && Strings.isEmpty(u.getFirstname()) && 
Strings.isEmpty(u.getLastname()));
+               behavior.setOption("autoOpen", 
isVisible(form.getModelObject()));
                behavior.setOption("closeOnEscape", false);
                behavior.setOption("dialogClass", Options.asString("no-close"));
                behavior.setOption("resizable", false);