Skip to content
Snippets Groups Projects
Commit d0cbe36c authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Modification suite réunion

parent c164b6d1
No related branches found
No related tags found
No related merge requests found
Pipeline #11114 passed
...@@ -25,7 +25,7 @@ class RenduController extends AbstractActionController { ...@@ -25,7 +25,7 @@ class RenduController extends AbstractActionController {
return new ViewModel([ return new ViewModel([
'title' => "Affichage du contenu #" . $rendu->getId(), 'title' => "Affichage du contenu #" . $rendu->getId(),
'contenu' => $rendu, 'rendu' => $rendu,
]); ]);
} }
......
...@@ -67,6 +67,7 @@ class TemplateController extends AbstractActionController { ...@@ -67,6 +67,7 @@ class TemplateController extends AbstractActionController {
$form = $this->getTemplateForm(); $form = $this->getTemplateForm();
$form->setAttribute('action', $this->url()->fromRoute('contenu/template/modifier', ['template' => $template->getId()], [], true)); $form->setAttribute('action', $this->url()->fromRoute('contenu/template/modifier', ['template' => $template->getId()], [], true));
$form->bind($template); $form->bind($template);
$form->setOldCode($template->getCode());
$request = $this->getRequest(); $request = $this->getRequest();
if ($request->isPost()) { if ($request->isPost()) {
......
...@@ -8,6 +8,11 @@ class Template implements ResourceInterface ...@@ -8,6 +8,11 @@ class Template implements ResourceInterface
{ {
const RESOURCE_ID = 'Template'; const RESOURCE_ID = 'Template';
public function generateTag() : string
{
return (implode('_', [$this->getResourceId(), $this->getCode()]));
}
/** /**
* @return string * @return string
*/ */
......
...@@ -92,7 +92,7 @@ class RenduService { ...@@ -92,7 +92,7 @@ class RenduService {
* @param int $id * @param int $id
* @return Rendu|null * @return Rendu|null
*/ */
public function getRendu(int $id) : ?Rendu public function getRendu(?int $id) : ?Rendu
{ {
$qb = $this->createQueryBuilder() $qb = $this->createQueryBuilder()
->andWhere('contenu.id = :id') ->andWhere('contenu.id = :id')
...@@ -111,7 +111,7 @@ class RenduService { ...@@ -111,7 +111,7 @@ class RenduService {
* @param string $param * @param string $param
* @return Rendu|null * @return Rendu|null
*/ */
public function getRequestedRendu(AbstractActionController $controller, string $param='contenu') : ?Rendu public function getRequestedRendu(AbstractActionController $controller, string $param='rendu') : ?Rendu
{ {
$id = $controller->params()->fromRoute($param); $id = $controller->params()->fromRoute($param);
$result = $this->getRendu($id); $result = $this->getRendu($id);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
/** /**
* @see \UnicaenRenderer\View\Helper\RenduViewHelper * @see \UnicaenRenderer\View\Helper\RenduViewHelper
* @var Rendu $contenu * @var Rendu $rendu
* @var array $options * @var array $options
*/ */
...@@ -15,29 +15,29 @@ use UnicaenRenderer\Entity\Db\Rendu; ...@@ -15,29 +15,29 @@ use UnicaenRenderer\Entity\Db\Rendu;
<dl> <dl>
<dt> Identifiant </dt> <dt> Identifiant </dt>
<dd> <dd>
<?php echo $contenu->getId(); ?> <?php echo $rendu->getId(); ?>
</dd> </dd>
<dt> Template </dt> <dt> Template </dt>
<dd> <dd>
<?php if ($contenu->getTemplate()) : ?> <?php if ($rendu->getTemplate()) : ?>
<?php echo $contenu->getTemplate()->getCode(); ?> <?php echo $rendu->getTemplate()->getCode(); ?>
<?php else: ?> <?php else: ?>
<i>Aucun template associé</i> <i>Aucun template associé</i>
<?php endif; ?> <?php endif; ?>
</dd> </dd>
<dt> Date de génération </dt> <dt> Date de génération </dt>
<dd> <dd>
<?php echo $contenu->getDate()->format('d/m/Y'); ?> <?php echo $rendu->getDate()->format('d/m/Y'); ?>
</dd> </dd>
</dl> </dl>
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<?php echo $contenu->getSujet(); ?> <?php echo $rendu->getSujet(); ?>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<?php echo $contenu->getCorps(); ?> <?php echo $rendu->getCorps(); ?>
</div> </div>
</div> </div>
</div> </div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment