[Noalyss-commit] [noalyss] 149/323: Fix : duplicate id (exercice)

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit ed9a886bc2e2065b70ad12a0f0020fd3537a4b29
Author: Dany De Bontridder <address@hidden>
Date:   Wed Feb 7 22:34:23 2018 +0100

    Fix : duplicate id (exercice)
---
 html/js/scripts.js               | 7 +++++--
 include/ajax/ajax_preference.php | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/html/js/scripts.js b/html/js/scripts.js
index 027e8a4..2bc7159 100644
--- a/html/js/scripts.js
+++ b/html/js/scripts.js
@@ -3479,9 +3479,12 @@ function progress_bar_check(p_idx, p_taskid)
     }
 }
                                                 
-
+/**
+ * In the user's setting  box, update the period list with the choosen exercice
+ * @param {int} p_dossier
+ */
 function updatePeriodePreference(p_dossier)
 {
-    var exercice=$('exercice').value;
+    var exercice=$('exercice_setting').value;
     new 
Ajax.Updater('setting_period',"ajax_misc.php",{method:"get",parameters:{ 
"op":"pref_exercice","gDossier":p_dossier,"exercice":exercice}});  
 }
\ No newline at end of file
diff --git a/include/ajax/ajax_preference.php b/include/ajax/ajax_preference.php
index f2d1aac..07f62bf 100644
--- a/include/ajax/ajax_preference.php
+++ b/include/ajax/ajax_preference.php
@@ -131,7 +131,7 @@ if (isset($_REQUEST['gDossier']) && 
$_REQUEST['gDossier']<>0)
                         <?=_("Exercice")?>
                     </td>
                     <td>
-                        
<?=$exercice->select("exercice",$selected_exercice,$js)->input();?>
+                        
<?=$exercice->select("exercice_setting",$selected_exercice,$js)->input();?>
                     </td>
                 </tr>
                <tr>