From 37ce1ab1cb12306e9f9b274bc24090a52ee907b8 Mon Sep 17 00:00:00 2001
From: Eric Quinton <eric.quinton@irstea.fr>
Date: Tue, 27 Mar 2018 11:32:30 +0200
Subject: [PATCH] =?UTF-8?q?Correction=20de=20l'affichage=20des=20lieux=20d?=
=?UTF-8?q?e=20pr=C3=A9l=C3=A8vement=20en=20rechercher=20d'=C3=A9chantillo?=
=?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
En recherche d'échantillon, si une collection est sélectionnée, le lieu
de prélèvement n'est pas correctement resélectionné lors de l'affichage
de la liste
---
display/templates/gestion/sampleSearch.tpl | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/display/templates/gestion/sampleSearch.tpl b/display/templates/gestion/sampleSearch.tpl
index 7dd35a270..744435577 100644
--- a/display/templates/gestion/sampleSearch.tpl
+++ b/display/templates/gestion/sampleSearch.tpl
@@ -88,24 +88,26 @@ $(document).ready(function () {
function getSamplingPlace () {
var colid = $("#collection_id").val();
- console.log ("colid:"+colid);
var url = "index.php";
var data = { "module":"samplingPlaceGetFromCollection", "collection_id": colid };
$.ajax ( { url:url, data: data})
.done (function( d ) {
if (d ) {
d = JSON.parse(d);
- options = '<option value="">Sélectionnez...</option>';
+ options = '<option value=""></option>';
for (var i = 0; i < d.length; i++) {
+ var libelle = "";
+ if (d[i].sampling_place_code) {
+ libelle = d[i].sampling_place_code + " - ";
+ }
+ libelle += d[i].sampling_place_name;
options += '<option value="'+d[i].sampling_place_id + '"';
if (d[i].sampling_place_id == sampling_place_init ) {
- options += ' selected ';
+ options += ' selected="selected" ';
+ $("#sampling_place_id").next().find(".custom-combobox-input").val(libelle);
}
options += '>';
- if (d[i].sampling_place_code) {
- options += d[i].sampling_place_code + " - ";
- }
- options += d[i].sampling_place_name;
+ options += libelle;
options += '</option>';
};
--
GitLab