diff --git a/SQL/002_privileges.sql b/SQL/002_privileges.sql index d3181b373f1a16e4526cdfe368dc50ad81b48d17..4c7e7eb0b9f0e0fdd3a77273045f7ffd3f6f819c 100644 --- a/SQL/002_privileges.sql +++ b/SQL/002_privileges.sql @@ -4,7 +4,6 @@ INSERT INTO unicaen_privilege_categorie (id ,code, libelle, ordre, namespace) VA INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documentmacro_index', 'Afficher l''index des macros', 1); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documentmacro_ajouter', 'Ajouter une macro', 10); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documentmacro_modifier', 'Modifier une macro', 20); -INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documentmacro_historiser', 'Historiser/Restaure une macro', 30); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documentmacro_supprimer', 'Supprimer une macro', 40); -- TEMPLATE @@ -12,7 +11,6 @@ INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) INSERT INTO unicaen_privilege_categorie (id, code, libelle, ordre, namespace) VALUES (next_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate', 'UnicaenRenderer - Gestion des templates', 11020, 'UnicaenRenderer\Provider\Privilege'); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_index', 'Afficher l''index des contenus', 1); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_modifier', 'Modifier un contenu', 20); -INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_historiser', 'Historiser/Restaurer un contenu', 30); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_supprimer', 'Supprimer un contenu', 40); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_ajouter', 'Ajouter un contenu', 15); INSERT INTO unicaen_privilege_privilege (id, categorie_id, code, libelle, ordre) VALUES (next_val('unicaen_privilege_privilege_id_seq'), current_val('unicaen_privilege_categorie_id_seq'), 'documenttemplate_afficher', 'Afficher un template', 10); diff --git a/config/merged/macro.config.php b/config/merged/macro.config.php index d2e8cb1b60c1d9719fc8f62d866dc0df661dc318..805f77163f98d703184d6ada52bc60362e501b1d 100755 --- a/config/merged/macro.config.php +++ b/config/merged/macro.config.php @@ -45,16 +45,6 @@ return [ DocumentmacroPrivileges::DOCUMENTMACRO_MODIFIER, ], ], - [ - 'controller' => MacroController::class, - 'action' => [ - 'historiser', - 'restaurer', - ], - 'privileges' => [ - DocumentmacroPrivileges::DOCUMENTMACRO_HISTORISER, - ], - ], [ 'controller' => MacroController::class, 'action' => [ @@ -136,26 +126,6 @@ return [ ], ], ], - 'historiser' => [ - 'type' => Segment::class, - 'options' => [ - 'route' => '/historiser/:macro', - 'defaults' => [ - 'controller' => MacroController::class, - 'action' => 'historiser', - ], - ], - ], - 'restaurer' => [ - 'type' => Segment::class, - 'options' => [ - 'route' => '/restaurer/:macro', - 'defaults' => [ - 'controller' => MacroController::class, - 'action' => 'restaurer', - ], - ], - ], 'supprimer' => [ 'type' => Segment::class, 'options' => [ diff --git a/config/merged/template.config.php b/config/merged/template.config.php index 252ff0d4f543f9f468158e2e50cb56e2b08c72c0..1be0ddabff663881780cbe26fde6a41002d72797 100755 --- a/config/merged/template.config.php +++ b/config/merged/template.config.php @@ -53,16 +53,6 @@ return [ DocumenttemplatePrivileges::DOCUMENTTEMPLATE_MODIFIER, ], ], - [ - 'controller' => TemplateController::class, - 'action' => [ - 'historiser', - 'restaurer', - ], - 'privileges' => [ - DocumenttemplatePrivileges::DOCUMENTTEMPLATE_HISTORISER, - ], - ], [ 'controller' => TemplateController::class, 'action' => [ @@ -144,26 +134,6 @@ return [ ], ], ], - 'restaurer' => [ - 'type' => Segment::class, - 'options' => [ - 'route' => '/restaurer/:template', - 'defaults' => [ - 'controller' => TemplateController::class, - 'action' => 'restaurer', - ], - ], - ], - 'historiser' => [ - 'type' => Segment::class, - 'options' => [ - 'route' => '/historiser/:template', - 'defaults' => [ - 'controller' => TemplateController::class, - 'action' => 'historiser', - ], - ], - ], 'detruire' => [ 'type' => Segment::class, 'options' => [ diff --git a/readme.md b/readme.md index fc5a2e9558debd5cce2cacda02052ce876a8cb09..ed01af12a5d531c509fb8296d8d919b845478f18 100755 --- a/readme.md +++ b/readme.md @@ -116,7 +116,6 @@ Privilèges associés au module const DOCUMENTMACRO_INDEX = 'documentmacro-documentmacro_index'; const DOCUMENTMACRO_AJOUTER = 'documentmacro-documentmacro_ajouter'; const DOCUMENTMACRO_MODIFIER = 'documentmacro-documentmacro_modifier'; -const DOCUMENTMACRO_HISTORISER = 'documentmacro-documentmacro_historiser'; const DOCUMENTMACRO_SUPPRIMER = 'documentmacro-documentmacro_supprimer'; ``` @@ -127,7 +126,6 @@ const DOCUMENTTEMPLATE_INDEX = 'documenttemplate-documenttemplate_index'; const DOCUMENTTEMPLATE_AFFICHER = 'documenttemplate-documenttemplate_afficher'; const DOCUMENTTEMPLATE_AJOUTER = 'documenttemplate-documenttemplate_ajouter'; const DOCUMENTTEMPLATE_MODIFIER = 'documenttemplate-documenttemplate_modifier'; -const DOCUMENTTEMPLATE_HISTORISER = 'documenttemplate-documenttemplate_historiser'; const DOCUMENTTEMPLATE_SUPPRIMER = 'documenttemplate-documenttemplate_supprimer'; ``` diff --git a/src/UnicaenRenderer/Controller/MacroController.php b/src/UnicaenRenderer/Controller/MacroController.php index 1fc90d527f11204b25c4d5ff14e51b2e18f8230b..7213b53617eb7dbcea8f97cbecf188eb37bddb79 100755 --- a/src/UnicaenRenderer/Controller/MacroController.php +++ b/src/UnicaenRenderer/Controller/MacroController.php @@ -85,20 +85,6 @@ class MacroController extends AbstractActionController { return $vm; } - public function historiserAction() - { - $macro = $this->getMacroService()->getRequestedMacro($this); - $this->getMacroService()->historise($macro); - return $this->redirect()->toRoute('contenu/macro', [], [], true); - } - - public function restaurerAction() - { - $macro = $this->getMacroService()->getRequestedMacro($this); - $this->getMacroService()->restore($macro); - return $this->redirect()->toRoute('contenu/macro', [], [], true); - } - public function supprimerAction() { $macro = $this->getMacroService()->getRequestedMacro($this); diff --git a/src/UnicaenRenderer/Controller/TemplateController.php b/src/UnicaenRenderer/Controller/TemplateController.php index a7e79d3b6929fae208d4446da0c7e98c5ddd6f57..e7435de9510f1fb7b76051d758ed4ee5daf82a01 100755 --- a/src/UnicaenRenderer/Controller/TemplateController.php +++ b/src/UnicaenRenderer/Controller/TemplateController.php @@ -83,22 +83,6 @@ class TemplateController extends AbstractActionController { ]); } - public function historiserAction() - { - $template = $this->getTemplateService()->getRequestedTemplate($this); - $this->getTemplateService()->historise($template); - - return $this->redirect()->toRoute('contenu/template', [], [], true); - } - - public function restaurerAction() - { - $template = $this->getTemplateService()->getRequestedTemplate($this); - $this->getTemplateService()->restore($template); - - return $this->redirect()->toRoute('contenu/template', [], [], true); - } - public function detruireAction() { $template = $this->getTemplateService()->getRequestedTemplate($this); diff --git a/src/UnicaenRenderer/Form/Template/TemplateForm.php b/src/UnicaenRenderer/Form/Template/TemplateForm.php index 333af4c19e1218fb70256130cc25e92dd04f37f9..5de3907e1a0ef6f7436f7659df46d76914b8c5ac 100755 --- a/src/UnicaenRenderer/Form/Template/TemplateForm.php +++ b/src/UnicaenRenderer/Form/Template/TemplateForm.php @@ -74,7 +74,7 @@ class TemplateForm extends Form { ]); //complement $this->add([ - 'name' => 'complement', + 'name' => 'sujet', 'type' => 'textarea', 'options' => [ 'label' => 'Sujet (sujet du courrier électronique, nom du fichier, étiquette, ... ) * : ', @@ -83,13 +83,13 @@ class TemplateForm extends Form { ], ], 'attributes' => [ - 'id' => 'complement', - 'class' => 'form-control complement', + 'id' => 'sujet', + 'class' => 'form-control sujet', ] ]); //template $this->add([ - 'name' => 'template', + 'name' => 'corps', 'type' => 'textarea', 'options' => [ 'label' => 'Corps * : ', @@ -98,8 +98,8 @@ class TemplateForm extends Form { ], ], 'attributes' => [ - 'id' => 'template', - 'class' => 'form-control contenu', + 'id' => 'corps', + 'class' => 'form-control corps', ] ]); //css @@ -153,8 +153,8 @@ class TemplateForm extends Form { 'old-code' => ['required' => false, ], 'type' => ['required' => true, ], 'description' => ['required' => false, ], - 'complement' => ['required' => true, ], - 'contenu' => ['required' => true, ], + 'sujet' => ['required' => true, ], + 'corps' => ['required' => true, ], 'css' => ['required' => false, ], ])); diff --git a/src/UnicaenRenderer/Form/Template/TemplateHydrator.php b/src/UnicaenRenderer/Form/Template/TemplateHydrator.php index 17522a4b5fdbcce938dd6b6d457e28de967558d6..be9fc99d1ab1616455fe8a08afa897c7879008cd 100755 --- a/src/UnicaenRenderer/Form/Template/TemplateHydrator.php +++ b/src/UnicaenRenderer/Form/Template/TemplateHydrator.php @@ -17,8 +17,8 @@ class TemplateHydrator implements HydratorInterface { 'code' => ($object)?$object->getCode():null, 'type' => ($object)?$object->getType():null, 'description' => ($object)?$object->getDescription():null, - 'complement' => ($object)?$object->getComplement():null, - 'template' => ($object)?$object->getTemplate():null, + 'sujet' => ($object)?$object->getSujet():null, + 'corps' => ($object)?$object->getCorps():null, 'css' => ($object)?$object->getCss():null, ]; @@ -35,15 +35,15 @@ class TemplateHydrator implements HydratorInterface { $code = (isset($data['code']) AND trim($data['code']) !== "")?trim($data['code']):null; $type = (isset($data['type']) AND trim($data['type']) !== "")?trim($data['type']):null; $description = (isset($data['description']) AND trim($data['description']) !== "")?trim($data['description']):null; - $complement = (isset($data['complement']) AND trim($data['complement']) !== "")?strip_tags(trim($data['complement'])):null; - $template = (isset($data['template']) AND trim($data['template']) !== "")?trim($data['template']):null; + $sujet = (isset($data['sujet']) AND trim($data['sujet']) !== "")?strip_tags(trim($data['sujet'])):null; + $corps = (isset($data['corps']) AND trim($data['corps']) !== "")?trim($data['corps']):null; $css = (isset($data['css']) AND trim($data['css']) !== "")?strip_tags(trim($data['css'])):null; $object->setCode($code); $object->setType($type); $object->setDescription($description); - $object->setComplement($complement); - $object->setTemplate($contenu); + $object->setSujet($sujet); + $object->setCorps($corps); $object->setCss($css); return $object; diff --git a/src/UnicaenRenderer/Provider/Privilege/DocumenttemplatePrivileges.php b/src/UnicaenRenderer/Provider/Privilege/DocumenttemplatePrivileges.php index 3239a3fd22396756949cf1c0f896d540f0ea26f1..075f43159691d46ca3d18b8172806052e06b4d9a 100644 --- a/src/UnicaenRenderer/Provider/Privilege/DocumenttemplatePrivileges.php +++ b/src/UnicaenRenderer/Provider/Privilege/DocumenttemplatePrivileges.php @@ -10,6 +10,5 @@ class DocumenttemplatePrivileges extends Privileges const DOCUMENTTEMPLATE_AJOUTER = 'documenttemplate-documenttemplate_ajouter'; const DOCUMENTTEMPLATE_AFFICHER = 'documenttemplate-documenttemplate_afficher'; const DOCUMENTTEMPLATE_MODIFIER = 'documenttemplate-documenttemplate_modifier'; - const DOCUMENTTEMPLATE_HISTORISER = 'documenttemplate-documenttemplate_historiser'; const DOCUMENTTEMPLATE_SUPPRIMER = 'documenttemplate-documenttemplate_supprimer'; } \ No newline at end of file diff --git a/src/UnicaenRenderer/Service/Macro/MacroService.php b/src/UnicaenRenderer/Service/Macro/MacroService.php index 98017709be99936359363ccb4d400e94d86dccde..92dd4de1363b45f99fe5cbcb0f13082c4fdfc41c 100755 --- a/src/UnicaenRenderer/Service/Macro/MacroService.php +++ b/src/UnicaenRenderer/Service/Macro/MacroService.php @@ -202,9 +202,7 @@ class MacroService { $result = "let macros = [\n"; foreach ($macros as $macro) { - if ($macro->estNonHistorise()) { - $result .= " { title:'" . $macro->getCode() . "', description:'" . strip_tags(str_replace("'","\'",$macro->getDescription())) . "', content:'VAR[" . $macro->getCode() . "]' },\n"; - } + $result .= " { title:'" . $macro->getCode() . "', description:'" . strip_tags(str_replace("'","\'",$macro->getDescription())) . "', content:'VAR[" . $macro->getCode() . "]' },\n"; } $result .= "];\n"; diff --git a/src/UnicaenRenderer/Service/Template/TemplateService.php b/src/UnicaenRenderer/Service/Template/TemplateService.php index 1b1c2aba9197204015ee8ec697725bfc09509893..1d95eb59d5f1304f60ee9522b69bf36a6f0cfbf4 100755 --- a/src/UnicaenRenderer/Service/Template/TemplateService.php +++ b/src/UnicaenRenderer/Service/Template/TemplateService.php @@ -48,34 +48,6 @@ class TemplateService { return $template; } - /** - * @param Template $template - * @return Template - */ - public function historise(Template $template) : Template - { - try { - $this->getEntityManager()->flush($template); - } catch (ORMException $e) { - throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD du Template.", $e); - } - return $template; - } - - /** - * @param Template $template - * @return Template - */ - public function restore(Template $template) : Template - { - try { - $this->getEntityManager()->flush($template); - } catch (ORMException $e) { - throw new RuntimeException("Un problème est survenue lors de l'enregistrement en BD du Template.", $e); - } - return $template; - } - /** * @param Template $template * @return Template diff --git a/view/unicaen-renderer/macro/index.phtml b/view/unicaen-renderer/macro/index.phtml index 8d6bca9fb9ea09a144d89427d34b278cb095c91e..7003de222f0b62647368dff5deb6e9f1c6a2640e 100755 --- a/view/unicaen-renderer/macro/index.phtml +++ b/view/unicaen-renderer/macro/index.phtml @@ -48,7 +48,7 @@ $this->headTitle("Index des macros"); </thead> <tbody> <?php foreach($macros as $macro) : ?> - <tr <?php if ($macro->estHistorise()) echo 'class="historise"'; ?> > + <tr> <td> <?php echo $macro->getCode(); ?> <?php if ($macro->getDescription() !== null) : ?> @@ -69,21 +69,6 @@ $this->headTitle("Index des macros"); > <span class="icon editer"></span></a> <?php endif; ?> - <?php if ($canHistoriser) : ?> - <?php if ($macro->estHistorise()): ?> - <a href="<?php echo $this->url('contenu/macro/restaurer', ['macro' => $macro->getId()], [], true); ?>" - data-toggle="tooltip" data-html="true" - title="Restauration de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>" - > - <span class="icon restaurer"></span></a> - <?php else :?> - <a href="<?php echo $this->url('contenu/macro/historiser', ['macro' => $macro->getId()], [], true); ?>" - data-toggle="tooltip" data-html="true" - title="Historiser de la macro <span class='highlight macro'><?php echo $macro->getCode(); ?></span>" - > - <span class="icon historiser"></span> - <?php endif; ?> - <?php endif; ?> <?php if ($canSupprimer) : ?> <a href="<?php echo $this->url('contenu/macro/supprimer', ['macro' => $macro->getId()], [], true); ?>" class="ajax-modal" data-event="modification" data-toggle="tooltip" data-html="true" diff --git a/view/unicaen-renderer/template/afficher.phtml b/view/unicaen-renderer/template/afficher.phtml index 6e8cf5453923fe8518554177f9ad3d7cf14e5e4d..14d8d4856deec0c108993cf1d57d833586675002 100755 --- a/view/unicaen-renderer/template/afficher.phtml +++ b/view/unicaen-renderer/template/afficher.phtml @@ -1,10 +1,10 @@ <?php -use UnicaenRenderer\Entity\Db\Content; +use UnicaenRenderer\Entity\Db\Template; /** * @see \UnicaenRenderer\Controller\ContenuController::afficherAction() - * @var Content $contenu + * @var Template $contenu */ ?> diff --git a/view/unicaen-renderer/template/index.phtml b/view/unicaen-renderer/template/index.phtml index f61b65624ed7a91aa492b7cba055e41b9dca911a..8be9ee451057e73e7802fbed1d69c6fc41a86f27 100755 --- a/view/unicaen-renderer/template/index.phtml +++ b/view/unicaen-renderer/template/index.phtml @@ -11,7 +11,6 @@ use UnicaenRenderer\Provider\Privilege\DocumenttemplatePrivileges; $canAjouter = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_AJOUTER)); $canAfficher = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_AFFICHER)); $canModifier = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_MODIFIER)); -$canHistoriser = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_HISTORISER)); $canDetruire = $this->isAllowed(DocumenttemplatePrivileges::getResourceId(DocumenttemplatePrivileges::DOCUMENTTEMPLATE_SUPPRIMER)); $this->headTitle("Index des templates"); @@ -40,7 +39,7 @@ $this->headTitle("Index des templates"); </thead> <tbody> <?php foreach ($templates as $template) : ?> - <tr class="<?php if ($template->estHistorise()) echo 'historise '; ?>"> + <tr> <td> <?php echo $template->getCode(); ?> <?php if ($template->getDescription() !== null) : ?> @@ -65,19 +64,6 @@ $this->headTitle("Index des templates"); > <span class="icon editer"></span></a> <?php endif; ?> - <?php if ($canHistoriser) : ?> - <?php if ($template->estNonHistorise()) : ?> - <?php /** @see \UnicaenRenderer\Controller\TemplateController::historiserAction() */?> - <a href="<?php echo $this->url('contenu/template/historiser', ['template' => $template->getId()], [], true); ?>" - > - <span class="icon historiser"></span></a> - <?php else : ?> - <?php /** @see \UnicaenRenderer\Controller\TemplateController::restaurerAction() */?> - <a href="<?php echo $this->url('contenu/template/restaurer', ['template' => $template->getId()], [], true); ?>" - > - <span class="icon restaurer"></span></a> - <?php endif; ?> - <?php endif; ?> <?php if ($canDetruire) : ?> <?php /** @see \UnicaenRenderer\Controller\TemplateController::detruireAction() */?> <a href="<?php echo $this->url('contenu/template/detruire', ['template' => $template->getId()], [], true); ?>" diff --git a/view/unicaen-renderer/template/modifier.phtml b/view/unicaen-renderer/template/modifier.phtml index 444434d13bdf1d3ad10ff2e88e22f3487359818b..09693c561582d30dee53e2e5b0df08cff7e32060 100755 --- a/view/unicaen-renderer/template/modifier.phtml +++ b/view/unicaen-renderer/template/modifier.phtml @@ -1,11 +1,11 @@ <?php -use UnicaenRenderer\Form\Contenu\ContenuForm; +use UnicaenRenderer\Form\Template\TemplateForm; /** * @see \UnicaenRenderer\Controller\ContenuController::ajouterAction() * @see \UnicaenRenderer\Controller\ContenuController::modifierAction() - * @var ContenuForm $form + * @var TemplateForm $form * @var string $macros */ @@ -46,7 +46,7 @@ use UnicaenRenderer\Form\Contenu\ContenuForm; } }); tinymce.init({ - selector: '.complement', + selector: '.sujet', toolbar: 'newdocument undo redo | template', resize: true, language: 'fr_FR', @@ -56,15 +56,15 @@ use UnicaenRenderer\Form\Contenu\ContenuForm; browser_spellcheck: true, branding: false, menu: {}, - body_id: 'complement', + body_id: 'sujet', setup: function (editor) { editor.on("focusout", function () { - $('textarea#complement').val(tinymce.get('complement').getContent()); + $('textarea#sujet').val(tinymce.get('sujet').getContent()); }); } }); tinymce.init({ - selector: '.contenu', + selector: '.corps', menubar: 'table', toolbar: 'newdocument undo redo | bold italic | bullist table | alignjustify alignleft alignright aligncenter | formatselect template', block_formats: 'Normal=p;Titre 1=h1;Titre 2=h2;Titre 3=h3', @@ -76,10 +76,10 @@ use UnicaenRenderer\Form\Contenu\ContenuForm; browser_spellcheck: true, branding: false, menu: {}, - body_id: 'contenu', + body_id: 'corps', setup: function (editor) { editor.on("focusout", function () { - $('textarea#contenu').val(tinymce.get('contenu').getContent()); + $('textarea#corps').val(tinymce.get('corps').getContent()); }); } });