Skip to content

GitLab

Commit 3cf5b61d authored by THEO GUILLON's avatar THEO GUILLON
Browse files

Merge branch '437-annexes-en-erreur' into '2.0.0' 

Resolve "Annexes en erreur"

See merge request libriciel/pole-citoyens/web-DPO/web-DPO!436
parents 40eb4929 24f701d9
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 8 deletions
app/Model/Fiche.php
View file @ 3cf5b61d
......@@ -607,8 +607,9 @@ class Fiche extends AppModel implements LinkedOrganisationInterface {
$content = file_get_contents($filename);
break;
default:
$msgstr = 'Type MIME %s non pris en charge pour le fichier %s';
throw new RuntimeException(sprintf($msgstr, $mime, $filename));
break;
// $msgstr = 'Type MIME %s non pris en charge pour le fichier %s';
// throw new RuntimeException(sprintf($msgstr, $mime, $filename));
}
$donnees['corpsTraitements'][$key]['traitement_genere'] = [
......@@ -1188,14 +1189,17 @@ class Fiche extends AppModel implements LinkedOrganisationInterface {
$content = file_get_contents($filename);
break;
default:
$msgstr = 'Type MIME %s non pris en charge pour le fichier %s';
throw new RuntimeException(sprintf($msgstr, $mime, $filename));
break;
// $msgstr = 'Type MIME %s non pris en charge pour le fichier %s';
// throw new RuntimeException(sprintf($msgstr, $mime, $filename));
}
$donnees['fichiers'][$key]['valeur_annexe'] = [
'value' => $content,
'type' => 'file'
];
if (!empty($content)) {
$donnees['fichiers'][$key]['valeur_annexe'] = [
'value' => $content,
'type' => 'file'
];
}
$donnees['info_fichiers'][$key]['valeur_nom_fichier'] = [
'value' => $fileAnnexe['Fichier']['nom'],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment