Browse Source

Merge pull request #19125 from atm-maxime/fix_recuitment_list_sql_error

Fix #19083 : wrong field list in sql request
Laurent Destailleur 3 years ago
parent
commit
c75db78cea

+ 2 - 4
htdocs/recruitment/recruitmentcandidature_list.php

@@ -237,13 +237,11 @@ $title = $langs->trans('ListOfCandidatures');
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= 't.'.$key.', ';
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 	}
 }
 // Add fields from hooks

+ 2 - 1
htdocs/recruitment/recruitmentjobposition_list.php

@@ -243,10 +243,11 @@ $title = $langs->trans('ListOfPositionsToBeFilled');
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
 $sql .= $object->getFieldList('t');
+
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
 	}
 }
 // Add fields from hooks