Author: solomax
Date: Tue May 19 10:19:37 2015
New Revision: 1680229
URL: http://svn.apache.org/r1680229
Log:
Organisations with null names are displayed as expected in select2 component
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1680229&r1=1680228&r2=1680229&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Tue May 19 10:19:37 2015
@@ -122,7 +122,8 @@ public class RoomForm extends AdminBaseF
@Override
protected String getDisplayText(RoomOrganisation
choice) {
- return choice.getOrganisation().getName();
+ String name =
choice.getOrganisation().getName();
+ return name == null ? "" : name;
}
@Override
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java?rev=1680229&r1=1680228&r2=1680229&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Tue May 19 10:19:37 2015
@@ -122,7 +122,8 @@ public class RoomForm extends AdminBaseF
@Override
protected String getDisplayText(RoomOrganisation
choice) {
- return choice.getOrganisation().getName();
+ String name =
choice.getOrganisation().getName();
+ return name == null ? "" : name;
}
@Override
