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 2023/04/27 08:52:24 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2768] Save button is always visible for new events
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 0915969d2 [OPENMEETINGS-2768] Save button is always visible for new events
0915969d2 is described below
commit 0915969d26bab027cbe41d547848355444d868bb
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Apr 27 15:52:12 2023 +0700
[OPENMEETINGS-2768] Save button is always visible for new events
---
.../apache/openmeetings/web/user/calendar/AppointmentDialog.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
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 c40359e35..0011e765f 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
@@ -214,6 +214,7 @@ public class AppointmentDialog extends Modal<Appointment> {
target.add(feedback);
}
});
+ save.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
addButton(enterRoom = new BootstrapAjaxLink<>(BUTTON_MARKUP_ID, null, Buttons.Type.Outline_Success, new ResourceModel("lbl.enter")) {
private static final long serialVersionUID = 1L;
@@ -243,10 +244,11 @@ public class AppointmentDialog extends Modal<Appointment> {
form.setModelObject(a);
form.start.setModelObject(getDateTime(a.getStart()));
form.end.setModelObject(getDateTime(a.getEnd()));
- form.setEnabled(isOwner(a));
+ final boolean isOwner = isOwner(a);
+ form.setEnabled(isOwner);
log.debug(" -- setModelObjectWithAjaxTarget -- Current model {}", a);
if (a.getId() != null) {
- delete.setVisible(isOwner(a));
+ delete.setVisible(isOwner);
enterRoom.setVisible(a.getRoom() != null);
} else {
delete.setVisible(false);
@@ -255,7 +257,7 @@ public class AppointmentDialog extends Modal<Appointment> {
if (a.getRoom() != null) {
sipContainer.replace(new Label("room.confno", a.getRoom().getConfno())).setVisible(a.getRoom().isSipEnabled());
}
- save.setVisible(isOwner(a));
+ save.setVisible(isOwner);
target.add(form, delete, enterRoom, save);
super.setModelObject(a);
}