From 7a8edf476de2ccd93131d92ae0c2581dee39b329 Mon Sep 17 00:00:00 2001 From: A511701 Date: Wed, 7 Jun 2017 15:13:13 +0200 Subject: [PATCH 1/2] * Correction de l'autocompletion qui fonctionnait mal notamment lorsque le nom contient des doubles quotes --- application/layouts/includes/nav-main.phtml | 1 + application/views/scripts/commission/competences.phtml | 1 + application/views/scripts/contact/index.phtml | 1 + application/views/scripts/dossier/index.phtml | 1 + application/views/scripts/dossier/liees.phtml | 1 + application/views/scripts/etablissement/edit.phtml | 2 ++ application/views/scripts/search/etablissement.phtml | 6 ++++++ 7 files changed, 13 insertions(+) diff --git a/application/layouts/includes/nav-main.phtml b/application/layouts/includes/nav-main.phtml index 5d2530cf..381aff03 100755 --- a/application/layouts/includes/nav-main.phtml +++ b/application/layouts/includes/nav-main.phtml @@ -65,6 +65,7 @@ } }, minChars: 3, + cacheLength: 0, width: 500, parse: function(data) { return $.map(data["response"]["results"], function(row) { diff --git a/application/views/scripts/commission/competences.phtml b/application/views/scripts/commission/competences.phtml index 0a7c1aaf..693937ec 100755 --- a/application/views/scripts/commission/competences.phtml +++ b/application/views/scripts/commission/competences.phtml @@ -55,6 +55,7 @@ $(".commune").autocomplete("/api/1.0/adresse/get_communes", { minChars: 3, + cacheLength: 0, parse: function(data) { return $.map(data["response"], function(row) {return {data: row,value: row.LIBELLE_COMMUNE,result: row.LIBELLE_COMMUNE}}); }, diff --git a/application/views/scripts/contact/index.phtml b/application/views/scripts/contact/index.phtml index 804bc870..a77bad80 100755 --- a/application/views/scripts/contact/index.phtml +++ b/application/views/scripts/contact/index.phtml @@ -178,6 +178,7 @@ $("#nom_contact_existant").autocomplete("/contact/get?format=json", { minChars: 3, + cacheLength: 0, max: 100, parse: function(data) { return $.map(data["resultats"], function(row) { diff --git a/application/views/scripts/dossier/index.phtml b/application/views/scripts/dossier/index.phtml index 424dae73..a0cf726e 100755 --- a/application/views/scripts/dossier/index.phtml +++ b/application/views/scripts/dossier/index.phtml @@ -50,6 +50,7 @@ // Auto complétion de la ville pour le service instructeur $("#servInstVille").autocomplete("/api/1.0/adresse/get_communes", { minChars: 3, + cacheLength: 0, parse: function(data) { return $.map(data["response"], function(row) {return {data: row,value: row.LIBELLE_COMMUNE,result: row.LIBELLE_COMMUNE}}); }, diff --git a/application/views/scripts/dossier/liees.phtml b/application/views/scripts/dossier/liees.phtml index 37db088e..493826a8 100755 --- a/application/views/scripts/dossier/liees.phtml +++ b/application/views/scripts/dossier/liees.phtml @@ -227,6 +227,7 @@ return $("#saisieEtab").val(); } }, + cacheLength: 0, minChars: 3, width: 500, parse: function(data) { diff --git a/application/views/scripts/etablissement/edit.phtml b/application/views/scripts/etablissement/edit.phtml index 43f7ecbd..f802cdcd 100755 --- a/application/views/scripts/etablissement/edit.phtml +++ b/application/views/scripts/etablissement/edit.phtml @@ -886,6 +886,7 @@ // Auto complétion de la ville $("input[name='commune_ac']").autocomplete("/api/1.0/adresse/get_communes", { minChars: 2, + cacheLength: 0, parse: function(data) { return $.map(data["response"], function(row) {return {data: row,value: row.LIBELLE_COMMUNE,result: row.LIBELLE_COMMUNE}}); }, @@ -905,6 +906,7 @@ // Auto complétion de la rue $("input[name='voie_ac']").autocomplete('/api/1.0/adresse/get_voies', { minChars: 3, + cacheLength: 0, extraParams: { code_insee: function(){ return $("#adresse-modal input[name='code_insee']").val() } }, parse: function(data) { return $.map(data["response"], function(row) { return {data: row,value: row.LIBELLE_RUE,result: row.LIBELLE_RUE} }); diff --git a/application/views/scripts/search/etablissement.phtml b/application/views/scripts/search/etablissement.phtml index 110ae8c0..88e245f1 100755 --- a/application/views/scripts/search/etablissement.phtml +++ b/application/views/scripts/search/etablissement.phtml @@ -212,6 +212,7 @@ // Auto complétion de la ville $("form#zone_de_recherche_modal input[name='commune_ac']").autocomplete("/api/1.0/adresse/get_communes", { minChars: 3, + cacheLength: 0, parse: function(data) { return $.map(data["response"], function(row) {return {data: row,value: row.LIBELLE_COMMUNE,result: row.LIBELLE_COMMUNE}}); }, @@ -229,7 +230,12 @@ // Auto complétion de la rue $("form#zone_de_recherche_modal input[name='voie_ac']").autocomplete('/api/1.0/adresse/get_voies', { +<<<<<<< HEAD minChars: 3, +======= + minChars: 2, + cacheLength: 0, +>>>>>>> 7a90138... * Correction de l'autocompletion qui fonctionnait mal notamment lorsque le nom contient des doubles quotes extraParams: { code_insee: function(){ return $("input[name='code_insee']").val() } }, parse: function(data) { return $.map(data["response"], function(row) { return {data: row,value: row.LIBELLE_RUE,result: row.LIBELLE_RUE} }); From 5618b581e580044e0464cd771af5cd2cb47cadf4 Mon Sep 17 00:00:00 2001 From: A511701 Date: Wed, 7 Jun 2017 15:21:23 +0200 Subject: [PATCH 2/2] =?UTF-8?q?Correction=20d'un=20merge=20mal=20pass?= =?UTF-8?q?=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/scripts/search/etablissement.phtml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/application/views/scripts/search/etablissement.phtml b/application/views/scripts/search/etablissement.phtml index 88e245f1..13a27f26 100755 --- a/application/views/scripts/search/etablissement.phtml +++ b/application/views/scripts/search/etablissement.phtml @@ -230,12 +230,8 @@ // Auto complétion de la rue $("form#zone_de_recherche_modal input[name='voie_ac']").autocomplete('/api/1.0/adresse/get_voies', { -<<<<<<< HEAD minChars: 3, -======= - minChars: 2, cacheLength: 0, ->>>>>>> 7a90138... * Correction de l'autocompletion qui fonctionnait mal notamment lorsque le nom contient des doubles quotes extraParams: { code_insee: function(){ return $("input[name='code_insee']").val() } }, parse: function(data) { return $.map(data["response"], function(row) { return {data: row,value: row.LIBELLE_RUE,result: row.LIBELLE_RUE} });