From 76d0d5cc1d711ce11a0e85e7b09075f00e6725c3 Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Wed, 24 Jun 2020 16:59:41 +0200
Subject: [PATCH] =?UTF-8?q?=C3=89viter=20dans=20la=20vue=20des=20documents?=
=?UTF-8?q?=20d=E2=80=99un=20objet=20de=20proposer=20de=20le=20d=C3=A9tach?=
=?UTF-8?q?er=20si=20le=20document=20est=20'vu'=20dans=20le=20texte=20de?=
=?UTF-8?q?=20l=E2=80=99objet.=20Et=20par=20ailleurs,=20la=20boucle=20=5Fc?=
=?UTF-8?q?ompte=20=C3=A9tait=20ferm=C3=A9e=20tardivement=20et=20pouvait?=
=?UTF-8?q?=20provoquer=20un=20disfonctionnement=20des=20autorisations,=20?=
=?UTF-8?q?qui=20pouvaient=20tester=20un=20objet=20/=20id=5Fobjet=20d?=
=?UTF-8?q?=E2=80=99une=20autre=20liaison=20que=20celle=20en=20cours.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
modeles/document_case.html | 3 ++-
modeles/document_desc.html | 7 ++++---
prive/squelettes/inclure/document_infos.html | 5 ++---
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/modeles/document_case.html b/modeles/document_case.html
index 35e744dd..a6408d0b 100644
--- a/modeles/document_case.html
+++ b/modeles/document_case.html
@@ -39,10 +39,11 @@
<div class="actions">
<BOUCLE_compte(documents_liens){id_document}{0,2} />
[(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr,#SELF},ajax,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ <//B_compte>
[(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT,#SELF},ajax,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
<a href="#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}" target="_blank" class="editbox" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
- ]<//B_compte>
+ ]
[(#PIPELINE{document_desc_actions,#ARRAY{args,#ARRAY{id_document,#ID_DOCUMENT,position,document_case,objet,#OBJET,id_objet,#ID_OBJET},data,''}})]
</div>
[(#PIPELINE{afficher_metas_document,#ARRAY{args,#ARRAY{'quoi','document_case','id_document',#ID_DOCUMENT},data,''}})]
diff --git a/modeles/document_desc.html b/modeles/document_desc.html
index 1b884cff..b6704de8 100644
--- a/modeles/document_desc.html
+++ b/modeles/document_desc.html
@@ -84,14 +84,15 @@ Distribue sous licence GPL
][(#MODE|=={image}|non)[(#BOUTON_ACTION{<:medias:upload_info_mode_image:>,#URL_ACTION_AUTEUR{changer_mode_document,#ID_DOCUMENT-image,#SELF},ajax})]]
</div>]
<BOUCLE_compte(documents_liens){id_document}{0,2} />
- [(#TOTAL_BOUCLE|=={1}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}}|et{#VU|=={non}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax noscroll,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
- [(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax noscroll,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ [(#TOTAL_BOUCLE|=={1}|et{#VU|=={non}}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_supprimer_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT-suppr-safe,#SELF},ajax noscroll,<:medias:bouton_enlever_supprimer_document_confirmation:>,'',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
+ <//B_compte>
+ [(#VU|=={non}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF},ajax noscroll,'','',[(function(){jQuery("#doc(#ID_DOCUMENT)").animateRemove();return true;})()]})]]
[(#AUTORISER{modifier,document,#ID_DOCUMENT}|oui)
<div class="deplacer-modifier">
<span class="deplacer-document" data-rang="#RANG_LIEN"><img src='#CHEMIN_IMAGE{deplacer-16.png}' width='16' height='16' alt='<:medias:ordonner_ce_document|attribut_html:>' title='<:medias:ordonner_ce_document|attribut_html:>' /></span>
<a href="#URL_ECRIRE{document_edit,id_document=#ID_DOCUMENT}" target="_blank" class="editbox" tabindex="0" role="button"><:medias:bouton_modifier_document:></a>
</div>
- ]<//B_compte>
+ ]
[(#PIPELINE{document_desc_actions,#ARRAY{args,#ARRAY{id_document,#ID_DOCUMENT,position,document_desc,objet,#OBJET,id_objet,#ID_OBJET},data,''}})]
</div>
</div>
diff --git a/prive/squelettes/inclure/document_infos.html b/prive/squelettes/inclure/document_infos.html
index 225bf8f6..2625905f 100644
--- a/prive/squelettes/inclure/document_infos.html
+++ b/prive/squelettes/inclure/document_infos.html
@@ -8,9 +8,8 @@
<BOUCLE_liens(documents_liens){id_document}>
<li class='item #OBJET'>[(#CHEMIN_IMAGE{#OBJET|objet_info{icone_objet}|concat{-16.png}}|balise_img) ][(#ID_OBJET|generer_lien_entite{#OBJET})]
[(#VU|=={oui}|oui)
- [<span class='vu'>(#CHEMIN_IMAGE{document-vu-24.png}|balise_img|inserer_attribut{title,<:medias:document_vu:>}|inserer_attribut{alt,<:medias:document_vu:>})</span>]
- ]
- [(#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}|oui)
+ [<span class='vu'>(#CHEMIN_IMAGE{document-vu-24.png}|balise_img|inserer_attribut{title,<:medias:document_vu:>}|inserer_attribut{alt,<:medias:document_vu:>})</span>]
+ ][(#VU|=={non}|et{#AUTORISER{dissocierdocuments,#OBJET,#ID_OBJET}})
[(#BOUTON_ACTION{<:medias:bouton_enlever_document:>,[(#URL_ACTION_AUTEUR{dissocier_document,#ID_OBJET-#OBJET-#ID_DOCUMENT--safe,#SELF})],ajax,'',''})]
]
</li>
--
GitLab