Author: solomax
Date: Mon Sep 1 09:41:38 2014
New Revision: 1621720
URL: http://svn.apache.org/r1621720
Log:
[OPENMEETINGS-1076] language export is fixed
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
Modified:
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java?rev=1621720&r1=1621719&r2=1621720&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
(original)
+++
openmeetings/branches/3.0.x/src/db/java/org/apache/openmeetings/db/entity/label/Fieldlanguagesvalues.java
Mon Sep 1 09:41:38 2014
@@ -42,15 +42,15 @@ import org.apache.openmeetings.db.entity
@NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = :language_id ORDER BY
flv.fieldvalues_id ASC")
- , @NamedQuery(name="allFieldValuesIds", query = "SELECT
flv.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ + " AND flv.language_id = :language_id ORDER BY
flv.fieldvalues.fieldvalues_id ASC")
+ , @NamedQuery(name="allFieldValuesIds", query = "SELECT
flv.fieldvalues.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
+ " AND flv.language_id = :language_id")
, @NamedQuery(name="allNotTranslatedValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = 1 AND flv.fieldvalues_id
NOT IN (:id_list)")
+ + " AND flv.language_id = 1 AND
flv.fieldvalues.fieldvalues_id NOT IN (:id_list)")
, @NamedQuery(name="getFieldLanguagesValuesById"
, query = "SELECT f FROM Fieldlanguagesvalues f WHERE
f.fieldlanguagesvalues_id = :id")
, @NamedQuery(name="getFieldLanguagesValuesByValueAndLang"
