solve bug in multilingual editor issue #61 by @olufine

tematres · Nov 11, 2021 · ae71887 · ae71887
1 parent d012aeb
commit ae71887
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/common/include/fun.admin.php b/common/include/fun.admin.php
@@ -430,11 +430,13 @@ function addLocalTargetTerms($tvocab_id, $data = array())
     global $DBCFG;
 
     if ($ARRAYvocabulario["vocabulario_id"]>1) {
+
+        if(is_array($data["remove_tterm_rel"])){
         //delete equivalences
-        for ($i=0; $i<sizeof($data["remove_tterm_rel"]); ++$i) {
-            borra_r($data["remove_tterm_rel"][$i]);
-        }
-
+            for ($i=0; $i<sizeof($data["remove_tterm_rel"]); ++$i) {
+                borra_r($data["remove_tterm_rel"][$i]);
+            }
+        };
         //add equivalences
         for ($i=0; $i<sizeof($data["term_id"]); ++$i) {
             if (strlen($data["tterm_string"][$i])>1) {

diff --git a/common/include/fun.html_forms.php b/common/include/fun.html_forms.php
@@ -5,7 +5,7 @@
 // TemaTres : aplicación para la gestión de vocabularios controlados#       #
 // TemaTres : web application to manage controlled vocabularies
 //
-// Copyright (C) 2004-2008 Diego Ferreyra [email protected]
+// Copyright (C) 2004-2021 Diego Ferreyra [email protected]
 // Distribuido bajo Licencia GNU Public License, versión 2 (de junio de 1.991) Free Software Foundation
 //
 //
@@ -2622,7 +2622,7 @@ function FORMtransterm4char4map($tvocab_id, $filterEQ, $letra)
 
         $min= ($pag-1)*$limit;
         //modificar => sólo debe traer términos preferidos. Los términos alternativos no se traducen
-        $sqlDatosLetra=SQLterms2map4char($letra, array("min"=>$min,"limit"=>$limit,"filterEQ"=>$filterEQ));
+        $sqlDatosLetra=SQLterms2map4char($ARRAYvocabulario["vocabulario_id"],$letra, array("min"=>$min,"limit"=>$limit,"filterEQ"=>$filterEQ));
 
         $num_terms=($min>0) ? $min+1 :0;
 

diff --git a/common/include/fun.sql.php b/common/include/fun.sql.php
@@ -4443,13 +4443,15 @@ function SQLsrcnote($srcnote_id)
 //
 // Lista de términos preferentes (sin UF ni términos libres)
 //
-function SQLterms2map4char($char, $args = '')
+function SQLterms2map4char($target_tesauro_id, $char, $args = '')
 {
     global $DBCFG;
     global $CFG;
 
     $char=(ctype_digit($char)) ? $char : secure_data($char, "ADOsql");
 
+ 	$target_tesauro_id=secure_data($target_tesauro_id,"int");
+
     $defaults=array("min"=>0,"limit"=>CFG_NUM_SHOW_TERMSxTRAD);
 
     $whereFilter="";
@@ -4471,18 +4473,11 @@ function SQLterms2map4char($char, $args = '')
 
     $sql=SQL(
         "SELECT",
-        "t.tema_id,
-	t.tema,
-	t.estado_id,
-	t.isMetaTerm,
-	r.t_relacion,
-	tt.tema as tterm,
-	tt.tema_id as tterm_id,
-	r.id as r_id
+        "t.tema_id, t.tema,	t.estado_id, t.isMetaTerm, r.t_relacion, tt.tema as tterm, tt.tema_id as tterm_id, tt.tesauro_id,r.id as r_id
 	from $DBCFG[DBprefix]tema as t
 	left join $DBCFG[DBprefix]tabla_rel as uf on uf.id_mayor=t.tema_id and uf.t_relacion = 4
 	left join $DBCFG[DBprefix]tabla_rel as r on r.id_menor=t.tema_id and r.t_relacion in (5,6,7)
-	left join $DBCFG[DBprefix]tema as tt on r.id_mayor=tt.tema_id
+	left join $DBCFG[DBprefix]tema as tt on r.id_mayor=tt.tema_id and tt.tesauro_id=$target_tesauro_id
 	where $where
 	$whereFilter
 	and uf.id is null