Author: solomax
Date: Tue May 21 06:49:38 2013
New Revision: 1484670
URL: http://svn.apache.org/r1484670
Log:
NPE in EmailManager is fixed;
Layout of radio choices in Community form is fixed
Modified:
openmeetings/trunk/singlewebapp/ivysettings.xml
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
Modified: openmeetings/trunk/singlewebapp/ivysettings.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivysettings.xml?rev=1484670&r1=1484669&r2=1484670&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivysettings.xml (original)
+++ openmeetings/trunk/singlewebapp/ivysettings.xml Tue May 21 06:49:38 2013
@@ -23,7 +23,6 @@
<artifact
pattern="http://repo1.maven.org/maven2/[organisation]/[artifact]-[revision].[ext]";
/>
</url>
<url name="sonatype" m2compatible="true">
- <artifact
pattern="https://oss.sonatype.org/content/repositories/sourceforge-releases/[organisation]/[artifact]-[revision].[ext]";
/>
<artifact
pattern="https://oss.sonatype.org/content/repositories/central/[artifact]/[artifact]/[revision]/[artifact]-[revision].[ext]";
/>
</url>
<url name="googlecode">
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java?rev=1484670&r1=1484669&r2=1484670&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/EmailManager.java
Tue May 21 06:49:38 2013
@@ -108,7 +108,7 @@ public class EmailManager {
*/
public boolean checkUserEMail(String email) {
try {
- if (email.length() == 0)
+ if (email == null || email.length() == 0)
return true;
log.debug("checkUserMail: " + email);
TypedQuery<Address> query = em
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.html
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.html?rev=1484670&r1=1484669&r2=1484670&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.html
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.html
Tue May 21 06:49:38 2013
@@ -21,9 +21,20 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="formelementradiobox">
- <span wicket:id="community_settings"> <input type="radio" />
- <input type="radio" /> <input type="radio" />
- </span>
+ <div wicket:id="community_settings">
+ <div>
+ <input wicket:id="everybody" type="radio"
/><label wicket:for="everybody"><wicket:ommessage key="1160"/></label>
+ <div class="clear"></div>
+ </div>
+ <div>
+ <input wicket:id="contact" type="radio"
/><label wicket:for="contact"><wicket:ommessage key="1168"/></label>
+ <div class="clear"></div>
+ </div>
+ <div>
+ <input wicket:id="nobody" type="radio" /><label
wicket:for="nobody"><wicket:ommessage key="1169"/></label>
+ <div class="clear"></div>
+ </div>
+ </div>
</div>
<div class="formelement">
<label><wicket:ommessage key="1162" /></label>
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.java?rev=1484670&r1=1484669&r2=1484670&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/ComunityUserForm.java
Tue May 21 06:49:38 2013
@@ -18,28 +18,23 @@
*/
package org.apache.openmeetings.web.common;
-import java.util.Arrays;
-
import org.apache.openmeetings.persistence.beans.user.User;
-import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.IChoiceRenderer;
-import org.apache.wicket.markup.html.form.RadioChoice;
+import org.apache.wicket.markup.html.form.Radio;
+import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
public class ComunityUserForm extends Form<User> {
private static final long serialVersionUID = -4487619335283747717L;
public ComunityUserForm(String id, IModel<User> model) {
super(id, model);
- final String field1160 = WebSession.getString(1160); // 1160
everybody
- final String field1168 = WebSession.getString(1168); // 1168
contact
- final String field1169 = WebSession.getString(1169); // 1169
nobody
- add(new RadioChoice<Long>("community_settings", new
IModel<Long>() {
+ RadioGroup<Long> rg = new
RadioGroup<Long>("community_settings", new IModel<Long>() {
private static final long serialVersionUID = 1L;
public Long getObject() {
@@ -68,24 +63,10 @@ public class ComunityUserForm extends Fo
public void detach() {
}
- }, Arrays.asList(1L, 2L, 3L), new IChoiceRenderer<Long>() {
- private static final long serialVersionUID = 1L;
-
- public Object getDisplayValue(Long id) {
- if (id.equals(1L)) {
- return field1160;
- } else if (id.equals(2L)) {
- return field1168;
- } else {
- return field1169;
- }
- }
-
- public String getIdValue(Long id, int index) {
- return "" + id;
- }
-
- }));
+ });
+ add(rg.add(new Radio<Long>("everybody", Model.of(1L)), new
Radio<Long>("contact", Model.of(2L))
+ , new Radio<Long>("nobody",
Model.of(3L))).setOutputMarkupId(true).setRenderBodyOnly(false)
+ );
add(new TextArea<String>("userOffers"));
add(new TextArea<String>("userSearchs"));
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java?rev=1484670&r1=1484669&r2=1484670&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/user/rooms/RoomPanel.java
Tue May 21 06:49:38 2013
@@ -40,7 +40,7 @@ public class RoomPanel extends BasePanel
super(id);
StringValue swfVal = pp.get("swf");
- String swf = (swfVal.isEmpty() ? "main.as3.swf11.swf" :
swfVal.toString())
+ String swf = (swfVal.isEmpty() ? "maindebug.as3.swf11.swf" :
swfVal.toString())
+ new
PageParametersEncoder().encodePageParameters(pp);
add(new Label("init", String.format("initSwf('%s');",
swf)).setEscapeModelStrings(false));
}
