浏览代码

Adding check if url exists and module is installed

gabriel 6 年之前
父节点
当前提交
8abda36fad
共有 2 个文件被更改,包括 6 次插入4 次删除
  1. 2 2
      composer.lock
  2. 4 2
      src/FTTHBundle/Admin/ONUAdmin.php

+ 2 - 2
composer.lock

@@ -1947,7 +1947,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "65b2f7d20973ab2108bd5a2a03acd5c6364e2ff2"
+                "reference": "5e124f6f6dd407ba4cfa6cb34db67f8c9c2a4a1f"
             },
             "type": "library",
             "autoload": {
@@ -1962,7 +1962,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2019-04-05T14:00:21+00:00"
+            "time": "2019-04-16T15:54:39+00:00"
         },
         {
             "name": "ik/check-sintax-bundle",

+ 4 - 2
src/FTTHBundle/Admin/ONUAdmin.php

@@ -2,6 +2,7 @@
 
 namespace FTTHBundle\Admin;
 
+use Base\AdminBundle\Checks\CheckParametersAsURL;
 use Buzz\Message\RequestInterface as HttpRequestInterface;
 use Doctrine\ORM\EntityRepository;
 use FTTHBundle\Entity\NAP;
@@ -607,14 +608,15 @@ class ONUAdmin extends WorkflowBaseAdmin
     {
         // Consulto en stats la url del detalle de onu
         $onuShowUrl = '';
-        if ($statsUrl = $this->getParameter('url_stats')) {
+        $statsUrl = CheckParametersAsURL::checkParametersUrl($this->getConfigurationPool()->getContainer(), 'url_stats');
+        if (!is_null($statsUrl)) {
             $subject = $this->getSubject();
             $ws = $this->get('webservice');
             $url = $ws->buildUrl($statsUrl . '/api/onu/show/url.json', [
                 'ponSerialNumber' => $subject->getPonSerialNumber(),
             ]);
             $response = $ws->makeGetRequest($url);
-            $json_decode = json_decode($response, true);
+            $json_decode = json_decode($response,true);
             $onuShowUrl = isset($json_decode['url']) ? $json_decode['url'] : '';
         }