Author: solomax
Date: Sun Jun 3 10:41:43 2012
New Revision: 1345648
URL: http://svn.apache.org/viewvc?rev=1345648&view=rev
Log:
OPENMEETINGS-303 should be fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java?rev=1345648&r1=1345647&r2=1345648&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Fieldmanagment.java
Sun Jun 3 10:41:43 2012
@@ -321,7 +321,7 @@ public class Fieldmanagment {
return null;
}
- public Long addFieldValueByFieldAndLanguage(Long field_id,
+ public Long addFieldValueByFieldAndLanguage(Fieldvalues fv,
Long language_id, String fieldvalue) {
try {
@@ -329,7 +329,7 @@ public class Fieldmanagment {
flv.setStarttime(new Date());
flv.setValue(fieldvalue);
flv.setLanguage_id(language_id);
- flv.setFieldvalues_id(field_id);
+ flv.setFieldvalues(fv);
flv.setDeleted("false");
flv = em.merge(flv);
@@ -359,18 +359,16 @@ public class Fieldmanagment {
}
- public Long addField(String fieldName) {
+ public Fieldvalues addField(String fieldName) {
try {
-
Fieldvalues fl = new Fieldvalues();
fl.setStarttime(new Date());
fl.setName(fieldName);
fl.setDeleted("false");
fl = em.merge(fl);
- Long fieldId = fl.getFieldvalues_id();
- return fieldId;
+ return fl;
} catch (Exception ex2) {
log.error("[getConfKey]: ", ex2);
}
@@ -476,7 +474,7 @@ public class Fieldmanagment {
fv.setUpdatetime(new Date());
this.updateField(fv);
}
- this.addFieldValueByFieldAndLanguage(fieldvalues_id,
language_id,
+ this.addFieldValueByFieldAndLanguage(fv, language_id,
value);
return fieldvalues_id;
} catch (Exception ex2) {
@@ -487,18 +485,18 @@ public class Fieldmanagment {
public Long addFieldAndLabel(String name, String value, Long
language_id) {
try {
- Long fieldvalues_id = this.addField(name);
- if (fieldvalues_id > 0) {
-
this.addFieldValueByFieldAndLanguage(fieldvalues_id,
+ Fieldvalues fv = addField(name);
+ if (fv.getFieldvalues_id() > 0) {
+ this.addFieldValueByFieldAndLanguage(fv,
language_id, value);
- return fieldvalues_id;
+ return fv.getFieldvalues_id();
} else {
- return new Long(-1);
+ return -1L;
}
} catch (Exception ex2) {
log.error("[updateFieldLanguagesLabel]: ", ex2);
}
- return new Long(-1);
+ return -1L;
}
public SearchResult<Fieldvalues> getFieldsByLanguage(int start, int
max, String orderby,
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1345648&r1=1345647&r2=1345648&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
Sun Jun 3 10:41:43 2012
@@ -45,6 +45,7 @@ import org.openmeetings.app.data.user.St
import org.openmeetings.app.data.user.Usermanagement;
import org.openmeetings.app.data.user.dao.UsersDaoImpl;
import org.openmeetings.app.persistence.beans.basic.OmTimeZone;
+import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
import org.openmeetings.utils.ImportHelper;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -941,12 +942,15 @@ public class ImportInitvalues {
// log.error("result: "+langFieldIdIsInited+"
"+id+" "+name+" "+value);
+ Fieldvalues fv = null;
// Only do that for the first field-set
if (!langFieldIdIsInited) {
- fieldmanagment.addField(name);
+ fv = fieldmanagment.addField(name);
+ } else {
+ fv =
fieldmanagment.getFieldvaluesById(id);
}
-
fieldmanagment.addFieldValueByFieldAndLanguage(id,
+
fieldmanagment.addFieldValueByFieldAndLanguage(fv,
languages_id, value);
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java?rev=1345648&r1=1345647&r2=1345648&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/xmlimport/LanguageImport.java
Sun Jun 3 10:41:43 2012
@@ -84,7 +84,7 @@ public class LanguageImport {
fieldvalues_id, language_id);
if (flv == null) {
-
fieldmanagment.addFieldValueByFieldAndLanguage(fieldvalues_id,
+ fieldmanagment.addFieldValueByFieldAndLanguage(fv,
language_id, value);
} else {
flv.setValue(value);
