Merge remote-tracking branch 'remotes/origin/master' into HEAD

.drone.yml

@@ -26,6 +26,7 @@ pipeline:
       CLIENT: fd3
       MYSQL_ROOT_PASSWORD: ""
       DOMAIN: flowdat.com
+      MODULES_INSTALL: "base,ftth,etc"
       
 
     commands:

app/config/config.yml

@@ -76,6 +76,7 @@ twig:
         checked_is_user_logged_in: '%app.checked_is_user_logged_in%'
         navbar_menu: '%navbar_menu%'
         active_menu: '%active_menu%'
+        fd3_modules_install: '%fd3_modules_install%'
 
 # Doctrine Configuration
 doctrine:

app/config/parameters.yml.dist

@@ -47,3 +47,4 @@ parameters:
     env(HOST_DUMMY): http://www.flowdat.com/
 
     dhcp_server_ip: 255.255.255.255
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

app/config/parameters.yml.docker

@@ -46,3 +46,4 @@ parameters:
     env(HOST_DUMMY): http://www.flowdat.com/
 
     dhcp_server_ip: 255.255.255.255
+    fd3_modules_install: '%env(MODULES_INSTALL)%,base,configuracion'

app/config/security.yml

@@ -29,6 +29,7 @@ security:
                 target: /
                 success_handler: base_admin.security.logout.handler
             anonymous: true
+            access_denied_handler: kernel.handler.access_denied_handler
             # HWIOAuthBundle + BaseOAuthBundle Configuration
             oauth:
                 login_path: /login

composer.lock

@@ -1458,7 +1458,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "dc86f79ac9780d3b3c232b570e232e1eabe892ee"
+                "reference": "27ff6fd446c6d78d3f2b72e9724fb1a8aea46ab4"
             },
             "type": "library",
             "autoload": {
@@ -1473,7 +1473,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-10-05T12:54:04+00:00"
+            "time": "2018-10-05T13:54:13+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6328,7 +6328,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": false,
+    "prefer-lowest": true,
     "platform": {
         "php": ">=5.5.9"
     },

src/CablemodemBundle/Entity/CMTS.php

@@ -14,6 +14,8 @@ use DeviceBundle\Validator\Constraints as ValidatorAssert;
 use ExtraDataBundle\Entity\Traits\ExtraDataTrait;
 use Gedmo\SoftDeleteable\Traits\SoftDeleteableEntity as SoftDeleteable;
 use Base\AdminBundle\Interfaces\SoftDeleteInterface;
+use MapBundle\Entity\Interfaces\LocationInterface;
+use MapBundle\Entity\Traits\LocationTrait;
 
 /**
  * @ORM\Entity
@@ -25,12 +27,13 @@ use Base\AdminBundle\Interfaces\SoftDeleteInterface;
  *
  * @ValidatorAssert\Device
  */
-class CMTS implements DeviceInterface, TenancyIdTraitInterface, SoftDeleteInterface
+class CMTS implements DeviceInterface, TenancyIdTraitInterface, SoftDeleteInterface, LocationInterface
 {
 
     use ExtraDataTrait;
     use TenancyIdTrait;
     use SoftDeleteable;
+    use LocationTrait;
 
     /**
      * @ORM\Column(name="id", type="bigint", nullable=false)