diff --git a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java index e1d602f19f2e546935276a350475e26164ee8eb1..85279f0990383d6201f54e326c395326af5399dc 100755 --- a/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java +++ b/iparapheur-core/src/main/java/com/atolcd/parapheur/repo/impl/ParapheurServiceImpl.java @@ -4374,9 +4374,7 @@ public final class ParapheurServiceImpl implements ParapheurService, Initializin // On supprime le dossier archivé - logger.debug("ARCHIVER - Suppression du dossier"); - - handleDeleteDossier(dossier, bureauParent, false, currentUser); +// logger.debug("ARCHIVER - Suppression du dossier"); // dossierService.deleteDossier(dossier, false); } catch (org.alfresco.service.cmr.model.FileExistsException ex1) { throw new RuntimeException("Une archive nommée '" + nomArchive + "' existe déjà .", ex1); diff --git a/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/worker/impl/WorkerServiceImpl.java b/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/worker/impl/WorkerServiceImpl.java index 756f0f8cc91c5636fcb57501d66932dfc54b4405..b117a553c69465f7bdb65b5fe27762d5eec9c714 100644 --- a/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/worker/impl/WorkerServiceImpl.java +++ b/iparapheur-core/src/main/java/org/adullact/iparapheur/repo/worker/impl/WorkerServiceImpl.java @@ -559,8 +559,6 @@ public class WorkerServiceImpl implements WorkerService { @Override public boolean before() { - dossierNotDeleted = false; - titreArchive = (String) request.get(TITREARCHIVE); //TODO : Handle annexes array or boolean @@ -590,6 +588,21 @@ public class WorkerServiceImpl implements WorkerService { @Override public void after() { notificationService.sendPreparedNotificationsForDossier(node.getId()); + // Next, send deletion + JSONStringer messageJsonStringer = new JSONStringer(); + try { + messageJsonStringer.object(); + messageJsonStringer.key(WorkerService.ID).value(node.getId()); + messageJsonStringer.key(WorkerService.USERNAME).value(AuthenticationUtil.getRunAsUser()); + messageJsonStringer.key(WorkerService.ACTION).value(ACTION_DOSSIER.SUPPRESSION); + messageJsonStringer.key(WorkerService.TYPE).value(WorkerService.TYPE_DOSSIER); + messageJsonStringer.key(WorkerService.NOTIFME).value(false); + messageJsonStringer.endObject(); + } catch (JSONException e) { + e.printStackTrace(); + } + + messagesSender.sendWorker(messageJsonStringer.toString(), node.getId()); } }); }