diff --git a/includes/saisie/event/event_5500.php b/includes/saisie/event/event_5500.php index 0e54ef7fe..ea49e4b5a 100644 --- a/includes/saisie/event/event_5500.php +++ b/includes/saisie/event/event_5500.php @@ -1,7 +1,7 @@ diff --git a/includes/saisie/field_mandataire.php b/includes/saisie/field_mandataire.php index 0639740be..7d19ce1db 100644 --- a/includes/saisie/field_mandataire.php +++ b/includes/saisie/field_mandataire.php @@ -1,5 +1,9 @@ diff --git a/includes/saisie/field_opposition.php b/includes/saisie/field_opposition.php index d40e31200..4693818b9 100644 --- a/includes/saisie/field_opposition.php +++ b/includes/saisie/field_opposition.php @@ -1,5 +1,9 @@ diff --git a/includes/saisie/saisie_annonces.php b/includes/saisie/saisie_annonces.php index b0f5be997..4fcb45563 100644 --- a/includes/saisie/saisie_annonces.php +++ b/includes/saisie/saisie_annonces.php @@ -30,6 +30,7 @@ switch ( $subaction ) { break; case 'editDialog': + $inEditDialog = true; $idan = $params[2]; $siret = $params[3]; FB::log($siret, 'siret'); $siren = substr($siret,0,9); FB::log($siren, 'siren'); diff --git a/includes/saisie/saisie_form_event.php b/includes/saisie/saisie_form_event.php index e46eedcaa..60113b092 100644 --- a/includes/saisie/saisie_form_event.php +++ b/includes/saisie/saisie_form_event.php @@ -18,6 +18,11 @@ if ( $saisie['source']=='TA' ){ $select = 'selected'; } ?> + +getListeJalCollecte(); $liste = $tmp['result']; foreach ($liste as $id=>$lib) { @@ -84,8 +89,14 @@ foreach ($liste as $code=>$lib) { -> + $event) if ( in_array($key, $saisie['even']) ) { $select = 'selected'; } + $display = true; + if ( isset($inEditDialog) && $inEditDialog === true && empty($select) ){ + $display = false; + } + if ( $display ) { ?> - + diff --git a/www/js/annonces.js b/www/js/annonces.js index e785c627f..7961a55e7 100644 --- a/www/js/annonces.js +++ b/www/js/annonces.js @@ -37,8 +37,8 @@ $(document).ready(function(){ var dialogOpts = { bgiframe: true, title: title, - width: 800, - height: 400, + width: 650, + height: 500, modal: true, closeOnEscape: false, open: function(event, ui) {