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 2020/04/22 17:54:55 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2287]
appointment description displays rich text
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 11d70ea [OPENMEETINGS-2287] appointment description displays rich text
11d70ea is described below
commit 11d70eaa7a0e8874de9c6d8338f7f75fa448a933
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Apr 23 00:54:37 2020 +0700
[OPENMEETINGS-2287] appointment description displays rich text
---
.../org/apache/openmeetings/web/room/EventDetailDialog.java | 2 +-
.../java/org/apache/openmeetings/web/room/IconTextModal.java | 4 ++++
.../apache/openmeetings/web/room/RedirectMessageDialog.java | 12 ++++++++----
.../openmeetings/web/user/calendar/AppointmentDialog.java | 3 +++
.../org/apache/openmeetings/web/pages/auth/TestLoginUI.java | 2 +-
5 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
index 75a0148..10bb800 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.java
@@ -45,7 +45,7 @@ public class EventDetailDialog extends Modal<Appointment> {
super.onInitialize();
add(new Label("title"));
- add(new Label("description"));
+ add(new Label("description").setEscapeModelStrings(false));
add(new Label("owner.timeZoneId"));
add(new Label("start", getDateFormat().format(getModelObject().getStart())));
add(new Label("end", getDateFormat().format(getModelObject().getEnd())));
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
index eccc3fd..c7349e9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.java
@@ -59,6 +59,10 @@ public class IconTextModal extends Modal<String> {
return this;
}
+ public Label getLabel() {
+ return label;
+ }
+
public IconTextModal withErrorIcon() {
return withErrorIcon(ColorBehavior.Color.Danger);
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
index b25c14d..4637478 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
@@ -33,7 +33,6 @@ public class RedirectMessageDialog extends IconTextModal {
private final String labelId;
private final String url;
private final boolean autoOpen;
- private Component label;
public RedirectMessageDialog(String id, String labelId, boolean autoOpen, String url) {
super(id);
@@ -56,7 +55,7 @@ public class RedirectMessageDialog extends IconTextModal {
}
private void startTimer(IPartialPageRequestHandler handler) {
- label.add(new OmTimerBehavior(DELAY, labelId) {
+ getLabel().add(new OmTimerBehavior(DELAY, labelId) {
private static final long serialVersionUID = 1L;
@Override
@@ -67,9 +66,9 @@ public class RedirectMessageDialog extends IconTextModal {
throw new RedirectToUrlException(url);
}
}
- });
+ }).setOutputMarkupId(true);
if (handler != null) {
- handler.add(label);
+ handler.add(getLabel());
}
}
@@ -79,4 +78,9 @@ public class RedirectMessageDialog extends IconTextModal {
startTimer(handler);
return this;
}
+
+ @Override
+ protected Component createHeaderCloseButton(String id) {
+ return super.createHeaderCloseButton(id).setVisible(false);
+ }
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index 338476d..82b2341 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -62,6 +62,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -222,12 +223,14 @@ public class AppointmentDialog extends Modal<Appointment> {
}
});
enterRoom.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
+ enterRoom.add(AttributeAppender.append("data-dismiss", "modal"));
delete = new BootstrapAjaxLink<>("button", null, Buttons.Type.Outline_Danger, new ResourceModel("80")) {
private static final long serialVersionUID = 1L;
@Override
public void onClick(AjaxRequestTarget handler) {
deleteAppointment(handler);
+ AppointmentDialog.this.close(handler);
}
};
delete.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
diff --git a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
index 812fecf..92487d1 100644
--- a/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
+++ b/openmeetings-web/src/test/java/org/apache/openmeetings/web/pages/auth/TestLoginUI.java
@@ -153,7 +153,7 @@ public class TestLoginUI extends AbstractWicketTester {
}
private void performRegister(String uid, String lbl) throws ReflectiveOperationException, SecurityException {
- AbstractAjaxBehavior b1 = getButtonBehavior("signin", 0);
+ AbstractAjaxBehavior b1 = getButtonBehavior("signin", 1);
tester.executeBehavior(b1);
FormTester formTester = tester.newFormTester(PATH_REGISTER);
formTester.setValue("login", getLogin(uid));