Commit ae18ca18 authored by Théo GUILLON's avatar Théo GUILLON

Merge branch '156-modification-projet-dans-le-registre' into 'master'

Resolve "Modification projet dans le registre"

See merge request web-DPO/web-DPO!139
parents a6123064 a2238370
......@@ -272,7 +272,7 @@
],[
'class' => 'btn btn-default-danger', /*@todo search-reset*/
'escape' => false
]);
]);
// Bouton Appliquer les filtres
echo $this->Form->button('<i class="fa fa-filter fa-lg"><!----></i> ' . __d('registre', 'registre.btnFiltre'), [
......@@ -668,16 +668,18 @@
<?php
if ($this->Autorisation->isDpo()) {
if ($value['EtatFiche']['etat_id'] != 7 || $organisationActuelle['Organisation']['verrouiller'] == false) {
// Bouton de modification du traitement
echo $this->Form->button($this->Html->tag('i','<!---->',['class' => 'fa fa-pencil fa-lg']), [
'class' => 'btn btn-default-default boutonEdit btn-sm my-tooltip btn-edit-registre modif_traitement',
'id' => $value['Fiche']['id'],
'escapeTitle' => false,
'data-toggle' => 'modal',
'data-target' => '#modalEditRegistre',
'title' => __d('registre', 'registre.commentaireModifierTraitement')
]);
if ($value['EtatFiche']['etat_id'] != EtatFiche::ARCHIVER) {
if ($organisationActuelle['Organisation']['verrouiller'] == false) {
// Bouton de modification du traitement
echo $this->Form->button($this->Html->tag('i', '<!---->', ['class' => 'fa fa-pencil fa-lg']), [
'class' => 'btn btn-default-default boutonEdit btn-sm my-tooltip btn-edit-registre modif_traitement',
'id' => $value['Fiche']['id'],
'escapeTitle' => false,
'data-toggle' => 'modal',
'data-target' => '#modalEditRegistre',
'title' => __d('registre', 'registre.commentaireModifierTraitement')
]);
}
}
}
?>
......
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