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 2015/05/18 13:04:02 UTC
svn commit: r1679986 - in /openmeetings:
branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
Author: solomax
Date: Mon May 18 11:04:02 2015
New Revision: 1679986
URL: http://svn.apache.org/r1679986
Log:
Import is fixed to work with organisations with empty names
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
Modified: openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1679986&r1=1679985&r2=1679986&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/user/Organisation.java Mon May 18 11:04:02 2015
@@ -59,7 +59,7 @@ public class Organisation implements Ser
private Long organisation_id;
@Column(name="name")
- @Element(data=true)
+ @Element(data = true, required = false)
private String name;
@Column(name="insertedby")
Modified: openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java?rev=1679986&r1=1679985&r2=1679986&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/user/Organisation.java Mon May 18 11:04:02 2015
@@ -58,7 +58,7 @@ public class Organisation implements IDa
private Long id;
@Column(name="name")
- @Element(data=true)
+ @Element(data = true, required = false)
private String name;
@Column(name="insertedby")