[BF] - Editing a patch panel port - populates incorrect switch port -…

… islandbridgenetworks/IXP-Manager#60
inex · Oct 6, 2017 · 0c2fb6c · 0c2fb6c
1 parent 1a9d5ab
commit 0c2fb6c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/app/Http/Controllers/PatchPanel/PatchPanelPortController.php b/app/Http/Controllers/PatchPanel/PatchPanelPortController.php
@@ -187,10 +187,19 @@ public function edit( int $id, string $formType = null ): View {
         // If we're allocating this port, set the chargable flag to the patch panel's default:
         $chargeable = ( $allocating and $ppp->isStateAvailable()) ? $ppp->getPatchPanel()->getChargeable() : $ppp->getChargeable();
 
+
         if( $ppp->getSwitchPort() ) {
             // FIXME: Queries and logic could be improved.
             /** @noinspection PhpUndefinedMethodInspection - need to sort D2EM::getRepository factory inspection */
             $switchPorts = D2EM::getRepository(SwitcherEntity::class)->getAllPortsNotAssignedToPI( $ppp->getSwitchPort()->getSwitcher()->getId(), [], $ppp->getSwitchPort()->getId() );
+
+            // we add the current switch port in the list to display it
+            $switchPorts[ ] = [  "name" => $ppp->getSwitchPort()->getName(),
+                                 "typeid" => $ppp->getSwitchPort()->getType(),
+                                 "type" => $ppp->getSwitchPort()->resolveType(),
+                                 "id" => $ppp->getSwitchPort()->getId() ];
+
+            array_multisort( array_column( $switchPorts, 'id' ), SORT_ASC, $switchPorts );
         }
 
         // fill the form with patch panel port data

diff --git a/database/Entities/SwitchPort.php b/database/Entities/SwitchPort.php
@@ -971,4 +971,13 @@ public function getPatchPanelPort()
     {
         return $this->patchPanelPort;
     }
+
+    /**
+     * Turn the database integer representation of the type into text as
+     * defined in the self::$TYPES array (or 'Unknown')
+     * @return string
+     */
+    public function resolveType(): string {
+        return self::$TYPES[ $this->getType() ];
+    }
 }
diff --git a/database/Proxies/__CG__EntitiesSwitchPort.php b/database/Proxies/__CG__EntitiesSwitchPort.php
@@ -870,4 +870,15 @@ public function getPatchPanelPort()
         return parent::getPatchPanelPort();
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    public function resolveType(): string
+    {
+
+        $this->__initializer__ && $this->__initializer__->__invoke($this, 'resolveType', []);
+
+        return parent::resolveType();
+    }
+
 }