diff --git a/models/api_alfresco.py b/models/api_alfresco.py index 89098fa11aac0a4c0e92140c26a5045fce6e674a..d6747e63ef828fd03771d20fa0d6d170521325d3 100644 --- a/models/api_alfresco.py +++ b/models/api_alfresco.py @@ -230,7 +230,7 @@ class CgscopAlfresco(models.AbstractModel): contentType="application/pdf", ) return file_upload - except UpdateConflictException: + except (UpdateConflictException, ContentAlreadyExistsException): _logger.info("Le document %s existe déjà dans le dossier spécifié" % name) # Recherche noderef document existant children = cmis_obj.getChildren().getResults() @@ -239,10 +239,9 @@ class CgscopAlfresco(models.AbstractModel): pwc = old_cmis_file.checkout() # Mise à jour de la version pwc.checkin( - contentFile=file, contentType="application/pdf", properties=metadata + contentFile=file, contentType="application/pdf", ) except ( - ContentAlreadyExistsException, ObjectNotFoundException, InvalidArgumentException, ) as e: @@ -266,7 +265,6 @@ class CgscopAlfresco(models.AbstractModel): _("Le dossier parent n'existe pas ou n'est pas renseigné !") ) - # url = "/nodes/%s/children" % folder url = ( "/alfresco/api/-default-/public/alfresco/versions/1/nodes/%s/children?majorVersion=true" % folder