Explorar o código

Merged in FD3-751 (pull request #31)

FD3-751 vendors actualizados. Se corrige un error en el mapeo de Cablemodem. Se muestran las options de dhcp en el detalle de cablemodem
Guillermo Espinoza %!s(int64=6) %!d(string=hai) anos
pai
achega
0bb0bb218e

+ 2 - 2
composer.lock

@@ -1594,7 +1594,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/BaseOAuthClientBundle.git",
-                "reference": "596bc7b28ad90ba558da5b3eb5d7f26c583b148d"
+                "reference": "1c60fd91f1bb0fe5125da70908670629d4d341e6"
             },
             "require": {
                 "ext-curl": "*",
@@ -1613,7 +1613,7 @@
                 "bundle",
                 "oauth"
             ],
-            "time": "2018-10-23T15:06:48+00:00"
+            "time": "2018-12-04T13:12:24+00:00"
         },
         {
             "name": "ik/owner-voter-bundle",

+ 2 - 2
src/CablemodemBundle/Entity/Cablemodem.php

@@ -81,14 +81,14 @@ class Cablemodem implements DeviceInterface, TenancyIdTraitInterface, LocationIn
     protected $activationCode;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Node", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="Node", fetch="EXTRA_LAZY", inversedBy="cablemodems")
      * @ORM\JoinColumn(name="node_id", referencedColumnName="id", onDelete="SET NULL")
      * @JMS\MaxDepth(1)
      */
     protected $node;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Profile", fetch="EXTRA_LAZY")
+     * @ORM\ManyToOne(targetEntity="Profile", fetch="EXTRA_LAZY", inversedBy="cablemodems")
      * @ORM\JoinColumn(name="profile_id", referencedColumnName="id", onDelete="SET NULL")
      * @JMS\MaxDepth(1)
      *

+ 16 - 5
src/CablemodemBundle/Resources/views/CRUD/host_show_field.html.twig

@@ -19,17 +19,28 @@
             <th>{{ 'Mac'|trans({}, 'CablemodemBundle') }}</th><td>{{ host.mac }}</td>
         </tr>
         {% endif %}
-        {% if host.options %}
-        <tr class="sonata-ba-view-container">
-            <th>{{ 'Options'|trans({}, 'CablemodemBundle') }}</th><td>{{ host.options }}</td>
-        </tr>
-        {% endif %}
         <tr class="sonata-ba-view-container">
             <th>{{ 'HostType'|trans({}, 'CablemodemBundle') }}</th><td>{{ host.hostType.name }}</td>
         </tr>
         <tr class="sonata-ba-view-container">
             <th>{{ 'State'|trans({}, 'CablemodemBundle') }}</th><td>{{ host.state|trans({}, 'CablemodemBundle') }}</td>
         </tr>
+        {% if host.options %}
+        <tr class="sonata-ba-view-container">
+            <th>{{ 'Options'|trans({}, 'CablemodemBundle') }}</th>
+            <td>
+            <table class="table table-bordered">
+            {% for option in host.options|split(',') %}
+                {% set values = option|split(':') %}
+                <tr>
+                    <th>{{ values.0|replace({'{': '', '}': '', '"': ''}) }}</th>
+                    <td>{{ values.1|replace({'{': '', '}': '', '"': ''}) }}</td>
+                </tr>
+            {% endfor %}
+            </table>
+            </td>
+        </tr>
+        {% endif %}
     </tbody>
 </table>
 </td>