You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2014/02/07 07:04:54 UTC

svn commit: r1565542 - in /openmeetings: branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java

Author: solomax
Date: Fri Feb  7 06:04:53 2014
New Revision: 1565542

URL: http://svn.apache.org/r1565542
Log:
[OPENMEETINGS-906] additional guard against opening is added

Modified:
    openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
    openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java

Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1565542&r1=1565541&r2=1565542&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Feb  7 06:04:53 2014
@@ -62,8 +62,10 @@ public class GroupsPanel extends AdminPa
         final AjaxButton addUsersBtn = new AjaxButton("addUsersBtn") {
 			private static final long serialVersionUID = 1L;
         	@Override
-        	protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-				addUsersDialog.open(target);
+        	protected void onSubmit(AjaxRequestTarget target, Form<?> form1) {
+        		if (form.getModelObject().getOrganisation_id() != null) {
+        			addUsersDialog.open(target);
+        		}
         	}
         };
         

Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1565542&r1=1565541&r2=1565542&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Fri Feb  7 06:04:53 2014
@@ -62,8 +62,10 @@ public class GroupsPanel extends AdminPa
         final AjaxButton addUsersBtn = new AjaxButton("addUsersBtn") {
 			private static final long serialVersionUID = 1L;
         	@Override
-        	protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
-				addUsersDialog.open(target);
+        	protected void onSubmit(AjaxRequestTarget target, Form<?> form1) {
+        		if (form.getModelObject().getOrganisation_id() != null) {
+        			addUsersDialog.open(target);
+        		}
         	}
         };