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 2017/02/16 13:11:32 UTC
svn commit: r1783201 - in /openmeetings/application:
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/
branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/
trunk/openmeetings-web/src/ma...
Author: solomax
Date: Thu Feb 16 13:11:32 2017
New Revision: 1783201
URL: http://svn.apache.org/viewvc?rev=1783201&view=rev
Log:
[OPENMEETINGS-1560] user removal from group should work
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1783201&r1=1783200&r2=1783201&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Thu Feb 16 13:11:32 2017
@@ -76,6 +76,12 @@ public class GroupUsersPanel extends Pan
private static final long serialVersionUID = 1L;
@Override
+ protected void onInitialize() {
+ super.onInitialize();
+ form.setMultiPart(true);//need to be multipart due to parent form is multipart
+ }
+
+ @Override
protected void onSubmit(AjaxRequestTarget target) {
if (grpUser.getId() == null) {
users2add.remove(grpUser);
Modified: openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java?rev=1783201&r1=1783200&r2=1783201&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java Thu Feb 16 13:11:32 2017
@@ -38,7 +38,7 @@ import com.googlecode.wicket.jquery.ui.w
public abstract class ConfirmableAjaxBorder extends Border {
private static final long serialVersionUID = 1L;
private static final String DIALOG_ID = "dialog";
- private final Form<?> form = new Form<>("form");
+ protected final Form<?> form = new Form<>("form");
private final ConfirmableBorderDialog dialog;
public ConfirmableAjaxBorder(String id, String title, String message) {
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1783201&r1=1783200&r2=1783201&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java Thu Feb 16 13:11:32 2017
@@ -76,6 +76,12 @@ public class GroupUsersPanel extends Pan
private static final long serialVersionUID = 1L;
@Override
+ protected void onInitialize() {
+ super.onInitialize();
+ form.setMultiPart(true);//need to be multipart due to parent form is multipart
+ }
+
+ @Override
protected void onSubmit(AjaxRequestTarget target) {
if (grpUser.getId() == null) {
users2add.remove(grpUser);
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java?rev=1783201&r1=1783200&r2=1783201&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.java Thu Feb 16 13:11:32 2017
@@ -38,7 +38,7 @@ import com.googlecode.wicket.jquery.ui.w
public abstract class ConfirmableAjaxBorder extends Border {
private static final long serialVersionUID = 1L;
private static final String DIALOG_ID = "dialog";
- private final Form<?> form = new Form<>("form");
+ protected final Form<?> form = new Form<>("form");
private final ConfirmableBorderDialog dialog;
public ConfirmableAjaxBorder(String id, String title, String message) {