浏览代码

fixes. update vendors

Guillermo Espinoza 7 年之前
父节点
当前提交
9e27667d0c

+ 2 - 2
app/DoctrineMigrations/src/action.yml

@@ -11,9 +11,9 @@ insertorupdate:
         -
           id: 2
           name: "Config on Create/Update/Remove"
-          object_class: "IPv4Bundle\\Entity\\Host"
+          object_class: "HostBundle\\Entity\\Host"
           event: "a:3:{i:0;s:11:\"postPersist\";i:1;s:10:\"postUpdate\";i:2;s:9:\"preRemove\";}"
-          template: "echo \"{{object.mac}} Config on Create/Update/Remove (postPersist / PostUpdate / PreRemove)\"\r\nphp /opt/dhcp/bin/console workflow:apply --entity=IPv4Bundle\\\\Entity\\\\Host --id={{object.id}} --workflow=dhcp_workflow --transition=\"add_config\""
+          template: "echo \"{{object.mac}} Config on Create/Update/Remove (postPersist / PostUpdate / PreRemove)\"\r\nphp /opt/dhcp/bin/console workflow:apply --entity=HostBundle\\\\Entity\\\\Host --id={{object.id}} --workflow=dhcp_workflow --transition=\"add_config\""
           tenancy_id: 1
         -
           id: 3

+ 1 - 1
app/DoctrineMigrations/src/workflow.yml

@@ -12,5 +12,5 @@ insertorupdate:
           updated: "2018-05-22 12:34:41"
           tenancy_id: 1
           enable: 1
-          support: "a:3:{i:0;s:22:\"IPv4Bundle\\Entity\\Host\";i:1;s:22:\"IPv4Bundle\\Entity\\Pool\";i:2;s:24:\"IPv4Bundle\\Entity\\SubNet\";}"
+          support: "a:3:{i:0;s:22:\"HostBundle\\Entity\\Host\";i:1;s:22:\"IPv4Bundle\\Entity\\Pool\";i:2;s:24:\"IPv4Bundle\\Entity\\SubNet\";}"
           owner: "admin"

+ 2 - 2
composer.lock

@@ -1646,7 +1646,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "8120a10e176601e90fdaadbba1b47acc9865f64b"
+                "reference": "47ca3a59560cd1e7d8ae5e06ddbea62094fc2996"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1676,7 +1676,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-06-07T12:21:38+00:00"
+            "time": "2018-06-25T18:50:13+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

+ 8 - 2
src/KeaBundle/Controller/ConfigController.php

@@ -33,13 +33,19 @@ class ConfigController extends Controller
         $flashbag = $this->get('session')->getFlashBag();
 
         $form = $this->createFormBuilder()
-            ->add('dhcpId', EntityType::class, array('class' => 'DHCPBundle\Entity\DHCP', 'choice_label' => 'name', 'label' => $translator->trans("form.label_dhcp", array(), "KeaBundle")))
+            ->add('dhcpId', EntityType::class, array(
+                'class' => 'DHCPBundle\Entity\DHCP', 
+                'choice_label' => 'name', 
+                'label' => $translator->trans("form.label_dhcp", array(), "KeaBundle")
+            ))
             ->getForm();
 
         if ($dhcpId = $request->get('dhcpId')) {
             $action = $request->get('action');
 
-            $dhcp = $this->container->get("doctrine.orm.entity_manager")->getRepository("DHCPBundle\Entity\DHCP")->findOneById($dhcpId);
+            $dhcp = $this->container->get("doctrine.orm.entity_manager")
+            ->getRepository("DHCPBundle\Entity\DHCP")
+            ->findOneById($dhcpId);
             
             $keaConfigService = $this->get('kea.config');
 

+ 1 - 1
src/KeaBundle/Services/KeaConfigService.php

@@ -37,7 +37,7 @@ class KeaConfigService
     {
         $this->dhcpRepository = $em->getRepository('DHCPBundle:DHCP');
         $this->subnetRepository = $em->getRepository('IPv4Bundle:SubNet');
-        $this->hostRepository = $em->getRepository('IPv4Bundle:Host');
+        $this->hostRepository = $em->getRepository('HostBundle:Host');
         $this->webService = $ws;
     }