From e4cb40fae84cbfbe9e46ffc4ae526a3e01c5490b Mon Sep 17 00:00:00 2001 From: afornerot Date: Thu, 10 Jun 2021 11:43:09 +0200 Subject: [PATCH] modif strucutre pour badgeurl (ref #32115) --- .../src/Cadoles/PortalBundle/Entity/Item.php | 31 +++++++++++++++++++ .../Cadoles/PortalBundle/Form/AlertType.php | 2 ++ .../Cadoles/PortalBundle/Form/ItemType.php | 5 +++ .../Resources/views/Item/edit.html.twig | 2 ++ 4 files changed, 40 insertions(+) diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php index 0f3f45a1..0093680b 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Entity/Item.php @@ -95,6 +95,13 @@ class Item */ private $color; + /** + * @var string + * + * @ORM\Column(name="badgeurl", type="string", length=250, nullable=true) + */ + private $badgeurl; + /** * @var string * @@ -650,4 +657,28 @@ class Item { return $this->ssoitem; } + + /** + * Set badgeurl + * + * @param string $badgeurl + * + * @return Item + */ + public function setBadgeurl($badgeurl) + { + $this->badgeurl = $badgeurl; + + return $this; + } + + /** + * Get badgeurl + * + * @return string + */ + public function getBadgeurl() + { + return $this->badgeurl; + } } diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php index daae87a9..da9c81c3 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/AlertType.php @@ -119,12 +119,14 @@ class AlertType extends AbstractType ->add('publishedat', DateType::class, [ 'label' => 'Publier du', 'input' => 'datetime', + 'widget' => 'single_text' ]) ->add('unpublishedat', DateType::class, [ 'label' => 'Jusqu\'au', 'input' => 'datetime', 'required' => false, + 'widget' => 'single_text', 'years' => range(date('Y'), date('Y')+10) ]); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php index 016c9b39..bee632a3 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/ItemType.php @@ -118,6 +118,11 @@ class ItemType extends AbstractType "required" => false ]) + ->add('badgeurl', TextType::class, [ + 'label' => "Badge URL", + 'required' => false, + ]) + ->add('essential', CheckboxType::class, [ "label" => "Item essentiel ?", "required" => false diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig index 860038ab..7bae7cce 100755 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Item/edit.html.twig @@ -49,6 +49,8 @@ {{ form_row(form.subtitle) }} {{ form_row(form.essential) }} {{ form_row(form.content) }} + {{ form_row(form.badgeurl) }} + {{ form_row(form.protected) }}