diff --git a/application/controllers/GiantController.php b/application/controllers/GiantController.php index 1990bfa39..cb8f97f4f 100644 --- a/application/controllers/GiantController.php +++ b/application/controllers/GiantController.php @@ -431,7 +431,7 @@ class GiantController extends Zend_Controller_Action print_r(array('no')); } else { - print_r($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode); + print_r(json_encode($value->MonitoringOptions->MonitoringOption[0]->LanguageCodes->LanguageCode)); } } public function reteventsAction() diff --git a/application/views/default/scripts/giant/partials/rapports/Historiques.phtml b/application/views/default/scripts/giant/partials/rapports/Historiques.phtml index c0ca9e956..a7ffd94f2 100644 --- a/application/views/default/scripts/giant/partials/rapports/Historiques.phtml +++ b/application/views/default/scripts/giant/partials/rapports/Historiques.phtml @@ -17,8 +17,6 @@ - - diff --git a/library/Giant/giant.ini b/library/Giant/giant.ini index 4bb148448..fee31f95a 100644 --- a/library/Giant/giant.ini +++ b/library/Giant/giant.ini @@ -33,4 +33,4 @@ lifetime = "86403" [test] ;1 = test mode ;0 = production -TestIndication = '1' \ No newline at end of file +TestIndication = '0' \ No newline at end of file diff --git a/public/themes/default/scripts/giant.js b/public/themes/default/scripts/giant.js index 8284e0e2c..7a1aceb10 100644 --- a/public/themes/default/scripts/giant.js +++ b/public/themes/default/scripts/giant.js @@ -23,10 +23,14 @@ $(document).ready( function() $('select[name=LanguageCode]').fadeOut(); $("select[name=Pays] option:selected").each(function () { var values = $(this).attr('value'); - //alert(values); $.post('/giant/getpays',{Pays: values}, function(data) { - alert(data); - //alert($('select[name=LanguageCode]').html()); + data = (jQuery.parseJSON(data)); + $('select[name=LanguageCode]').find('option').remove(); + $.each(data, function(key, value) { + $('select[name=LanguageCode]') + .append($('