소스 검색

FD3-544 fixes

Espinoza Guillermo 7 년 전
부모
커밋
bd892795b4
3개의 변경된 파일10개의 추가작업 그리고 7개의 파일을 삭제
  1. 5 6
      src/IPv4Bundle/Admin/HostAdmin.php
  2. 1 0
      src/IPv4Bundle/Admin/SubNetAdmin.php
  3. 4 1
      src/IPv4Bundle/Entity/Host.php

+ 5 - 6
src/IPv4Bundle/Admin/HostAdmin.php

@@ -3,7 +3,7 @@
 namespace IPv4Bundle\Admin;
 namespace IPv4Bundle\Admin;
 
 
 use Base\AdminBundle\Admin\BaseAdmin;
 use Base\AdminBundle\Admin\BaseAdmin;
-use IPv4Bundle\Entity\Host;
+use IPv4Bundle\Utils\HostStatus;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\DatagridMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Datagrid\ListMapper;
 use Sonata\AdminBundle\Form\FormMapper;
 use Sonata\AdminBundle\Form\FormMapper;
@@ -51,12 +51,11 @@ class HostAdmin extends BaseAdmin
             ->tab('Host')
             ->tab('Host')
             ->with('Host')
             ->with('Host')
             ->add('mac')
             ->add('mac')
-            ->add('hostType')
+            ->add('hostType', null, [
+                'required' => true,
+            ])
             ->add('state', ChoiceType::class, [
             ->add('state', ChoiceType::class, [
-                'choices' => [
-                    Host::STATE_ACTIVE => Host::STATE_ACTIVE,
-                    Host::STATE_SUSPENDED => Host::STATE_SUSPENDED,
-                ],
+                'choices' => HostStatus::getChoices(),
                 'translation_domain' => 'IPv4Bundle',
                 'translation_domain' => 'IPv4Bundle',
             ])
             ])
         ->end()
         ->end()

+ 1 - 0
src/IPv4Bundle/Admin/SubNetAdmin.php

@@ -59,6 +59,7 @@ class SubNetAdmin extends BaseAdmin
                 ->add('status', ChoiceType::class, [
                 ->add('status', ChoiceType::class, [
                     'required' => false,
                     'required' => false,
                     'choices' => HostStatus::getChoices(),
                     'choices' => HostStatus::getChoices(),
+                    'translation_domain' => 'IPv4Bundle',
                 ])
                 ])
                 ->add('netGroup')
                 ->add('netGroup')
             ->end()
             ->end()

+ 4 - 1
src/IPv4Bundle/Entity/Host.php

@@ -4,9 +4,10 @@ namespace IPv4Bundle\Entity;
 
 
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping as ORM;
 use JMS\Serializer\Annotation as JMS;
 use JMS\Serializer\Annotation as JMS;
-use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
 use IPv4Bundle\Traits\DHCPOptionTrait;
 use IPv4Bundle\Traits\DHCPOptionTrait;
 use IPv4Bundle\Utils\HostStatus;
 use IPv4Bundle\Utils\HostStatus;
+use Symfony\Bridge\Doctrine\Validator\Constraints\UniqueEntity;
+use Symfony\Component\Validator\Constraints as Assert;
 use WorkflowBundle\Entity\Interfaces\WorkflowInterface;
 use WorkflowBundle\Entity\Interfaces\WorkflowInterface;
 use WorkflowBundle\Entity\Traits\WorkflowTrait;
 use WorkflowBundle\Entity\Traits\WorkflowTrait;
 
 
@@ -51,6 +52,8 @@ class Host implements WorkflowInterface
      * @ORM\JoinColumn(onDelete="CASCADE")
      * @ORM\JoinColumn(onDelete="CASCADE")
      *
      *
      * @JMS\MaxDepth(1)
      * @JMS\MaxDepth(1)
+     *
+     * @Assert\NotNull
      */
      */
     protected $hostType;
     protected $hostType;