FD3-507 Ajustes

composer.json

@@ -140,19 +140,19 @@
         "doctrine/orm": "^2.5",
         "dwoo/dwoo": "dev-master",
         "hwi/oauth-bundle": "^0.5.3",
-        "ik/audit-bundle": "v0.1.7",
-        "ik/auth-bundle": "v0.1.7",
-        "ik/base-admin-bundle": "v0.1.7",
-        "ik/device-bundle": "v0.1.7",
-        "ik/extra-data-bundle": "v0.1.7",
-        "ik/leaflet-bundle": "v0.1.7",
-        "ik/map-bundle": "v0.1.7",
-        "ik/migrations-bundle": "v0.1.7",
-        "ik/oauthclient-bundle": "v0.1.7",
-        "ik/owner-voter-bundle": "v0.1.7",
-        "ik/template-bundle": "v0.1.7",
-        "ik/webservice-bundle": "v0.1.7",
-        "ik/workflow-bundle": "v0.1.7",
+        "ik/audit-bundle": "dev-master",
+        "ik/auth-bundle": "dev-master",
+        "ik/base-admin-bundle": "dev-master",
+        "ik/device-bundle": "dev-master",
+        "ik/extra-data-bundle": "dev-master",
+        "ik/leaflet-bundle": "dev-master",
+        "ik/map-bundle": "dev-master",
+        "ik/migrations-bundle": "dev-master",
+        "ik/oauthclient-bundle": "dev-master",
+        "ik/owner-voter-bundle": "dev-master",
+        "ik/template-bundle": "dev-master",
+        "ik/webservice-bundle": "dev-master",
+        "ik/workflow-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
         "jdorn/sql-formatter": "^1.2.17",
         "jms/serializer": "^1.9.0",
@@ -248,4 +248,4 @@
         ],
         "branch-alias": null
     }
-}
+}

composer.lock

@@ -1698,7 +1698,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "9c70562562d4513c38873c958d588f5bedf5fda0"
+                "reference": "23fe93a7c76b4314d81c06f35748cb8107b45e0a"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1728,7 +1728,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2018-02-19T13:50:00+00:00"
+            "time": "2018-03-26T15:18:45+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",

src/CablemodemBundle/Entity/Cablemodem.php

@@ -87,8 +87,11 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
 
     /**
      * @ORM\ManyToOne(targetEntity="Profile", fetch="EXTRA_LAZY")
+     * @ORM\JoinColumn(nullable=false)
      *
      * @JMS\MaxDepth(1)
+     *
+     * @Assert\NotNull
      */
     protected $profile;
 

src/CablemodemBundle/Resources/config/services.yml

@@ -1,11 +1,11 @@
 services:
-    
-    cablemodem.admin.node:
-        class: CablemodemBundle\Admin\NodeAdmin
-        arguments: [~, CablemodemBundle\Entity\Node, BaseAdminBundle:CRUD]
+
+    cablemodem.admin.cablemodem:
+        class: CablemodemBundle\Admin\CablemodemAdmin
+        arguments: [~, CablemodemBundle\Entity\Cablemodem, WorkflowBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Node, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Cablemodem, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
@@ -14,25 +14,16 @@ services:
         arguments: [~, CablemodemBundle\Entity\Profile, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Profile, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+        calls:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.cablemodem_model:
-        class: CablemodemBundle\Admin\CablemodemModelAdmin
-        arguments: [~, CablemodemBundle\Entity\CablemodemModel, BaseAdminBundle:CRUD]
-        tags:
-            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CablemodemModel, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
-            - [setTranslationDomain, [CablemodemBundle]]
-        public: true
-
-    cablemodem.admin.cmts_model:
-        class: CablemodemBundle\Admin\CMTSModelAdmin
-        arguments: [~, CablemodemBundle\Entity\CMTSModel, BaseAdminBundle:CRUD]
+    cablemodem.admin.node:
+        class: CablemodemBundle\Admin\NodeAdmin
+        arguments: [~, CablemodemBundle\Entity\Node, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CMTSModel, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Node, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
@@ -41,15 +32,24 @@ services:
         arguments: [~, CablemodemBundle\Entity\CMTS, BaseAdminBundle:CRUD]
         tags:
             - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CMTS, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+        calls:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true
 
-    cablemodem.admin.cablemodem:
-        class: CablemodemBundle\Admin\CablemodemAdmin
-        arguments: [~, CablemodemBundle\Entity\Cablemodem, WorkflowBundle:CRUD]
+    cablemodem.admin.cablemodem_model:
+        class: CablemodemBundle\Admin\CablemodemModelAdmin
+        arguments: [~, CablemodemBundle\Entity\CablemodemModel, BaseAdminBundle:CRUD]
         tags:
-            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: Cablemodem, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
-        calls:    
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CablemodemModel, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:
+            - [setTranslationDomain, [CablemodemBundle]]
+        public: true
+
+    cablemodem.admin.cmts_model:
+        class: CablemodemBundle\Admin\CMTSModelAdmin
+        arguments: [~, CablemodemBundle\Entity\CMTSModel, BaseAdminBundle:CRUD]
+        tags:
+            - { name: sonata.admin, manager_type: orm, group: Cablemodem, label: CMTSModel, label_catalogue: CablemodemBundle, label_translator_strategy: sonata.admin.label.strategy.underscore }
+        calls:
             - [setTranslationDomain, [CablemodemBundle]]
         public: true