Procházet zdrojové kódy

FD3-316 Se agrega bundle con comandos para NAS.

Maxi Schvindt před 7 roky
rodič
revize
7fa93372a0
4 změnil soubory, kde provedl 14 přidání a 3 odebrání
  1. 1 0
      app/AppKernel.php
  2. 8 0
      composer.json
  3. 2 2
      composer.lock
  4. 3 1
      src/StatsBundle/Entity/Device.php

+ 1 - 0
app/AppKernel.php

@@ -56,6 +56,7 @@ class AppKernel extends Kernel
 
             new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
             new WorkflowBundle\WorkflowBundle(),
+            new NasBundle\NasBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

+ 8 - 0
composer.json

@@ -161,6 +161,13 @@
                 "local_pk": "./keys/bitbucket.id_rsa"
             },
             "name": "ik-sonata"
+        },
+        {
+            "type": "vcs",
+            "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/NasBundle.git",
+            "options": {
+                "local_pk": "./keys/bitbucket.id_rsa"
+            }
         }
     ],
     "require": {
@@ -189,6 +196,7 @@
         "ik/statsd-bundle": "dev-master",
         "ik/webservice-bundle": "dev-master",
         "ik/workflow-bundle": "dev-master",
+        "ik/stats/nas-bundle": "dev-master",
         "incenteev/composer-parameter-handler": "^2.0",
         "jms/serializer": "^1.9.0",
         "jms/serializer-bundle": "^1.5.0",

+ 2 - 2
composer.lock

@@ -1440,7 +1440,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "17a53335cc1ba075f2bca4b5f78400d27e94ff85"
+                "reference": "e53cfbcc9620f776428490e9ab92b151eab007bc"
             },
             "type": "library",
             "autoload": {
@@ -1455,7 +1455,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2018-01-03T15:05:50+00:00"
+            "time": "2018-01-04T14:56:46+00:00"
         },
         {
             "name": "ik/extra-data-bundle",

+ 3 - 1
src/StatsBundle/Entity/Device.php

@@ -166,7 +166,9 @@ class Device implements TenancyIdTraitInterface
 
     public function getShortType() 
     {
-        return str_replace("FTTHBundle\\Entity\\","",$this->deviceType);
+        $pieces = explode("\\", $this->deviceType);
+
+        return end($pieces);
     }
 
     /**