From b8aeb96a4dd730ad9a3cc3570c05d5347edf5466 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 13 Sep 2018 10:36:56 +0200
Subject: [PATCH] FIX #8346 delete convert only if pj is edited and pdf convert
is OK
---
modules/attachments/attachments_content.php | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/modules/attachments/attachments_content.php b/modules/attachments/attachments_content.php
index f955a95b9e7..ee34689a441 100755
--- a/modules/attachments/attachments_content.php
+++ b/modules/attachments/attachments_content.php
@@ -939,16 +939,20 @@ if (isset($_POST['add']) && $_POST['add']) {
//UPDATE QUERY
if ((int) $_REQUEST['relation'] == 1) {
$stmt = $db->query('UPDATE res_attachments SET '.$set_update.' WHERE res_id = :res_id', $arrayPDO);
- \Convert\models\AdrModel::deleteAttachAdr([
- 'resId' => $_REQUEST['res_id'],
- 'isVersion' => false
- ]);
+ if ($_SESSION['upfile'][0]['fileNamePdfOnTmp'] != '' && $_SESSION['upfile'][0]['upAttachment'] != false) {
+ \Convert\models\AdrModel::deleteAttachAdr([
+ 'resId' => $_REQUEST['res_id'],
+ 'isVersion' => false
+ ]);
+ }
} else {
$stmt = $db->query('UPDATE res_version_attachments SET '.$set_update.' WHERE res_id = :res_id', $arrayPDO);
- \Convert\models\AdrModel::deleteAttachAdr([
- 'resId' => $_REQUEST['res_id'],
- 'isVersion' => true
- ]);
+ if ($_SESSION['upfile'][0]['fileNamePdfOnTmp'] != '' && $_SESSION['upfile'][0]['upAttachment'] != false) {
+ \Convert\models\AdrModel::deleteAttachAdr([
+ 'resId' => $_REQUEST['res_id'],
+ 'isVersion' => true
+ ]);
+ }
}
}
//copie de la version PDF de la pièce si mode de conversion sur le client
--
GitLab