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/12/24 17:09:24 UTC
openmeetings git commit: [OPENMEETINGS-1802] group delete should be
fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 29d1804bb -> f6fb18889
[OPENMEETINGS-1802] group delete should be fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/f6fb1888
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/f6fb1888
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/f6fb1888
Branch: refs/heads/4.0.x
Commit: f6fb18889d1129d29eb80872039de8156e515e9a
Parents: 29d1804
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Dec 25 00:09:15 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Dec 25 00:09:15 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/openmeetings/web/admin/AdminSavePanel.html | 1 +
.../java/org/apache/openmeetings/web/admin/AdminSavePanel.java | 5 ++++-
.../org/apache/openmeetings/web/admin/groups/GroupForm.java | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f6fb1888/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
index f7844c1..875191b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.html
@@ -23,5 +23,6 @@
<div class="formNewButton" wicket:id="ajax-new-button" wicket:message="title:155"></div>
<div class="formCancelButton" wicket:id="ajax-cancel-button" wicket:message="title:157"></div>
<span wicket:id="newRecord"></span>
+ <form wicket:id="form"></form>
</wicket:extend>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f6fb1888/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
index 8f0dc95..109e9b5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
@@ -61,7 +61,10 @@ public abstract class AdminSavePanel<T> extends FormSaveRefreshPanel<T> {
}
};
// add a cancel button that can be used to submit the form via ajax
- final ConfirmableAjaxBorder delBtn = new ConfirmableAjaxBorder("ajax-cancel-button", getString("80"), getString("833"), (Form<?>)null) {
+ final Form<?> cForm = new Form<>("form");
+ cForm.setMultiPart(form.isMultiPart());
+ add(cForm);
+ final ConfirmableAjaxBorder delBtn = new ConfirmableAjaxBorder("ajax-cancel-button", getString("80"), getString("833"), cForm) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/f6fb1888/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
index 971003c..e453240 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
@@ -83,6 +83,7 @@ public class GroupForm extends AdminBaseForm<Group> {
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
super(id, new CompoundPropertyModel<>(group));
+ setMultiPart(true);
this.groupList = groupList;
setOutputMarkupId(true);