Author: solomax
Date: Tue Dec 29 09:35:20 2015
New Revision: 1722080
URL: http://svn.apache.org/viewvc?rev=1722080&view=rev
Log:
[OPENMEETINGS-1290] sip number is being displayed in invitation and appointment
dialogs
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
Tue Dec 29 09:35:20 2015
@@ -34,6 +34,10 @@
<td><label wicket:for="subject"><wicket:message
key="215" /></label></td>
<td><input type="text" wicket:id="subject"
class="input"/></td>
</tr>
+ <tr wicket:id="sip-container">
+ <td><wicket:message key="1003"/></td>
+ <td><span wicket:id="room.confno"></span></td>
+ </tr>
<tr>
<td><label wicket:for="message"><wicket:message
key="217" /></label></td>
<td><textarea wicket:id="message" style="width:
280px; height: 70px;"></textarea></td>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Tue Dec 29 09:35:20 2015
@@ -57,6 +57,7 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -147,6 +148,7 @@ public class InvitationDialog extends Ab
return id == null ? null : "" + id;
}
});
+ private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
public InvitationDialog(String id, long roomId) {
super(id, Application.getString(214), new
CompoundPropertyModel<Invitation>(new Invitation()));
@@ -164,6 +166,9 @@ public class InvitationDialog extends Ab
User u = getBean(UserDao.class).get(getUserId());
i.setInvitedBy(u);
i.setRoom(getBean(RoomDao.class).get(roomId));
+ if (i.getRoom() != null) {
+ target.add(sipContainer.replace(new
Label("room.confno",
i.getRoom().getConfno())).setVisible(i.getRoom().isSipEnabled()));
+ }
Calendar d = Calendar.getInstance();
i.setValidFrom(d.getTime());
d.add(Calendar.DATE, 1);
@@ -377,6 +382,8 @@ public class InvitationDialog extends Ab
});
rdi.add(new LanguageDropDown("language", new
PropertyModel<Long>(InvitationDialog.this, "lang")));
rdi.add(url.setOutputMarkupId(true));
+
rdi.add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ sipContainer.add(new Label("room.confno",
"")).setVisible(false);
add(feedback);
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Tue Dec 29 09:35:20 2015
@@ -50,6 +50,10 @@
<td><wicket:message key="406" /></td>
<td><select wicket:id="room"
></select></td>
</tr>
+ <tr wicket:id="sip-container">
+ <td><wicket:message key="1003"/></td>
+ <td><span
wicket:id="room.confno"></span></td>
+ </tr>
<tr>
<td colspan="2"><input type="checkbox"
wicket:id="passwordProtected" /><label
wicket:for="passwordProtected"><wicket:message key="524" /></label></td>
</tr>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Tue Dec 29 09:35:20 2015
@@ -52,6 +52,7 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -94,6 +95,7 @@ public class AppointmentDialog extends A
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
private IModel<Collection<User>> attendeesModel = new
CollectionModel<User>(new ArrayList<User>());
+ private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
@Override
public int getWidth() {
@@ -113,6 +115,9 @@ public class AppointmentDialog extends A
delete.setVisible(false, target);
enterRoom.setVisible(false, target);
}
+ if (a.getRoom() != null) {
+ target.add(sipContainer.replace(new
Label("room.confno",
a.getRoom().getConfno())).setVisible(a.getRoom().isSipEnabled()));
+ }
save.setVisible(isOwner(a), target);
super.setModelObject(a);
}
@@ -249,7 +254,6 @@ public class AppointmentDialog extends A
if (a.getReminder() == null) {
a.setReminder(Reminder.none);
}
-
if (a.getRoom() == null) {
Room r = new Room();
r.setAppointment(true);
@@ -339,6 +343,8 @@ public class AppointmentDialog extends A
target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom));
}
});
+
add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ sipContainer.add(new Label("room.confno",
"")).setVisible(false);
add(new AjaxCheckBox("passwordProtected") {
private static final long serialVersionUID = 1L;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.html
Tue Dec 29 09:35:20 2015
@@ -34,6 +34,10 @@
<td><label wicket:for="subject"><wicket:message
key="215" /></label></td>
<td><input type="text" wicket:id="subject"
class="input"/></td>
</tr>
+ <tr wicket:id="sip-container">
+ <td><wicket:message key="1003"/></td>
+ <td><span wicket:id="room.confno"></span></td>
+ </tr>
<tr>
<td><label wicket:for="message"><wicket:message
key="217" /></label></td>
<td><textarea wicket:id="message" style="width:
280px; height: 70px;"></textarea></td>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/InvitationDialog.java
Tue Dec 29 09:35:20 2015
@@ -57,6 +57,7 @@ import org.apache.wicket.ajax.form.AjaxF
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -147,6 +148,7 @@ public class InvitationDialog extends Ab
return id == null ? null : "" + id;
}
});
+ private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
public InvitationDialog(String id, long roomId) {
super(id, Application.getString(214), new
CompoundPropertyModel<Invitation>(new Invitation()));
@@ -164,6 +166,9 @@ public class InvitationDialog extends Ab
User u = getBean(UserDao.class).get(getUserId());
i.setInvitedBy(u);
i.setRoom(getBean(RoomDao.class).get(roomId));
+ if (i.getRoom() != null) {
+ target.add(sipContainer.replace(new
Label("room.confno",
i.getRoom().getConfno())).setVisible(i.getRoom().isSipEnabled()));
+ }
Calendar d = Calendar.getInstance();
i.setValidFrom(d.getTime());
d.add(Calendar.DATE, 1);
@@ -377,6 +382,8 @@ public class InvitationDialog extends Ab
});
rdi.add(new LanguageDropDown("language", new
PropertyModel<Long>(InvitationDialog.this, "lang")));
rdi.add(url.setOutputMarkupId(true));
+
rdi.add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ sipContainer.add(new Label("room.confno",
"")).setVisible(false);
add(feedback);
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.html
Tue Dec 29 09:35:20 2015
@@ -50,6 +50,10 @@
<td><wicket:message key="406" /></td>
<td><select wicket:id="room"
></select></td>
</tr>
+ <tr wicket:id="sip-container">
+ <td><wicket:message key="1003"/></td>
+ <td><span
wicket:id="room.confno"></span></td>
+ </tr>
<tr>
<td colspan="2"><input type="checkbox"
wicket:id="passwordProtected" /><label
wicket:for="passwordProtected"><wicket:message key="524" /></label></td>
</tr>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java?rev=1722080&r1=1722079&r2=1722080&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
Tue Dec 29 09:35:20 2015
@@ -52,6 +52,7 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
@@ -94,6 +95,7 @@ public class AppointmentDialog extends A
private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
final MessageDialog confirmDelete;
private IModel<Collection<User>> attendeesModel = new
CollectionModel<User>(new ArrayList<User>());
+ private final WebMarkupContainer sipContainer = new
WebMarkupContainer("sip-container");
@Override
public int getWidth() {
@@ -113,6 +115,9 @@ public class AppointmentDialog extends A
delete.setVisible(false, target);
enterRoom.setVisible(false, target);
}
+ if (a.getRoom() != null) {
+ target.add(sipContainer.replace(new
Label("room.confno",
a.getRoom().getConfno())).setVisible(a.getRoom().isSipEnabled()));
+ }
save.setVisible(isOwner(a), target);
super.setModelObject(a);
}
@@ -249,7 +254,6 @@ public class AppointmentDialog extends A
if (a.getReminder() == null) {
a.setReminder(Reminder.none);
}
-
if (a.getRoom() == null) {
Room r = new Room();
r.setAppointment(true);
@@ -339,6 +343,8 @@ public class AppointmentDialog extends A
target.add(roomType.setEnabled(createRoom), room.setEnabled(!createRoom));
}
});
+
add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
+ sipContainer.add(new Label("room.confno",
"")).setVisible(false);
add(new AjaxCheckBox("passwordProtected") {
private static final long serialVersionUID = 1L;
