Author: solomax
Date: Sun Sep 9 12:57:14 2012
New Revision: 1382486
URL: http://svn.apache.org/viewvc?rev=1382486&view=rev
Log:
new "language" field is removed from xml serialization
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java?rev=1382486&r1=1382485&r2=1382486&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/persistence/beans/user/Users.java
Sun Sep 9 12:57:14 2012
@@ -137,9 +137,10 @@ public class Users implements Serializab
@Column(name = "language_id")
@Element(data=true, required=false)
private Long language_id;
+
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "language_id", insertable = false, updatable = false)
- @Element(data=true, required=false)
+ //FIXME need to add correct language mapping
private FieldLanguage language;
@Column(name = "resethash")
