From 12c0080b3dd4eda8d4eff65592a22e902f32dba6 Mon Sep 17 00:00:00 2001 From: Garrett Date: Sun, 26 Sep 2021 04:18:01 +0000 Subject: [PATCH] 0.3.19 --- CHANGELOG | 8 ++- README.md | 2 +- backend/retrieve_floorplan_object_details.php | 50 ++++++++++--------- includes/Update.class.php | 19 +++++++ includes/definitions.php | 2 +- install/Install.class.php | 5 +- 6 files changed, 57 insertions(+), 29 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1229a5d..0184211 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -5,6 +5,7 @@ ChangeLog for PatchCableMgr **************************************************** Contents + - Changes Introduced In 0.3.19 - Changes Introduced In 0.3.18 - Changes Introduced In 0.3.17 - Changes Introduced In 0.3.16 @@ -37,7 +38,12 @@ Contents **************************************************** \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ -**Changes introduced in 0.3.17 +**Changes introduced in 0.3.19 +[Fix] Google authenticator version +[Fix] Floorplan object data not displaying +[Enhance] Added support for MM-OM1 media type + +**Changes introduced in 0.3.18 [Fix] Port description field spins after edit [Fix] Error when configuring managed cable connector type as ST [Enhance] Added ability to delete managed cable from Cable Inventory diff --git a/README.md b/README.md index e92540b..38fea30 100755 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# 0.3.18 \ No newline at end of file +# 0.3.19 \ No newline at end of file diff --git a/backend/retrieve_floorplan_object_details.php b/backend/retrieve_floorplan_object_details.php index 7ee86e6..d6030e5 100755 --- a/backend/retrieve_floorplan_object_details.php +++ b/backend/retrieve_floorplan_object_details.php @@ -28,32 +28,34 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){ $peerIDArray = array(); $objPortArray = array(); if($trunkable) { + $trunkFlatPath = isset($qls->App->peerArray[$objectID]) ? 'Yes' : 'No'; - foreach($qls->App->peerArray[$objectID][0][0]['peerArray'] as $peerID => $peer) { - foreach($peer as $peerFace => $face) { - foreach($face as $peerDepth => $peerPortArray) { - foreach($peerPortArray as $peerEntryID => $peerPort) { - $peerTemplateID = $qls->App->objectArray[$peerID]['template_id']; - $peerPort = $peerPort[1]; - $peerCompatibility = $qls->App->compatibilityArray[$peerTemplateID][$peerFace][$peerDepth]; - $peerPortLayoutX = $peerCompatibility['portLayoutX']; - $peerPortLayoutY = $peerCompatibility['portLayoutY']; - $peerPortTotal = $peerPortLayoutX * $peerPortLayoutY; - $peerPortNameFormatJSON = $peerCompatibility['portNameFormat']; - $peerPortNameFormat = json_decode($peerPortNameFormatJSON, true); - $peerPortName = $qls->App->generatePortName($peerPortNameFormat, $peerPort, $peerPortTotal); - - $peerIDValue = '4-'.$peerID.'-'.$peerFace.'-'.$peerDepth.'-'.$peerPort; - - $objPort = array( - //'peerEntryID' => $qls->App->peerArray[$objectID][0][0]['id'], - 'peerEntryID' => $peerEntryID, - 'portName' => $peerPortName - ); - - array_push($peerIDArray, $peerIDValue); - array_push($objPortArray, $objPort); + if(isset($qls->App->peerArray[$objectID][0][0]['peerArray'])) { + foreach($qls->App->peerArray[$objectID][0][0]['peerArray'] as $peerID => $peer) { + foreach($peer as $peerFace => $face) { + foreach($face as $peerDepth => $peerPortArray) { + foreach($peerPortArray as $peerEntryID => $peerPort) { + $peerTemplateID = $qls->App->objectArray[$peerID]['template_id']; + $peerPort = $peerPort[1]; + $peerCompatibility = $qls->App->compatibilityArray[$peerTemplateID][$peerFace][$peerDepth]; + $peerPortLayoutX = $peerCompatibility['portLayoutX']; + $peerPortLayoutY = $peerCompatibility['portLayoutY']; + $peerPortTotal = $peerPortLayoutX * $peerPortLayoutY; + $peerPortNameFormatJSON = $peerCompatibility['portNameFormat']; + $peerPortNameFormat = json_decode($peerPortNameFormatJSON, true); + $peerPortName = $qls->App->generatePortName($peerPortNameFormat, $peerPort, $peerPortTotal); + + $peerIDValue = '4-'.$peerID.'-'.$peerFace.'-'.$peerDepth.'-'.$peerPort; + + $objPort = array( + 'peerEntryID' => $peerEntryID, + 'portName' => $peerPortName + ); + + array_push($peerIDArray, $peerIDValue); + array_push($objPortArray, $objPort); + } } } } diff --git a/includes/Update.class.php b/includes/Update.class.php index 40b8db3..9c1c89f 100755 --- a/includes/Update.class.php +++ b/includes/Update.class.php @@ -110,6 +110,8 @@ var $qls; $this->update_0316_to_0317(); } else if($this->currentVersion == '0.3.17') { $this->update_0317_to_0318(); + } else if($this->currentVersion == '0.3.18') { + $this->update_0318_to_0319(); } else { return true; } @@ -118,6 +120,23 @@ var $qls; return false; } + /** + * Update from version 0.3.18 to 0.3.19 + * @return Boolean + */ + function update_0318_to_0319() { + $incrementalVersion = '0.3.19'; + + // Set app version to 0.3.19 + $this->qls->SQL->update('app_organization_data', array('version' => $incrementalVersion), array('id' => array('=', 1))); + + // Add media type + $mediaTypeColumns = array('value', 'name', 'category_id', 'category_type_id', 'defaultOption', 'display'); + $mediaTypeValues = array(9, 'MM-OM1', 2, 2, 0, 1); + $this->qls->SQL->insert('shared_mediaType', $mediaTypeColumns, $mediaTypeValues); + + } + /** * Update from version 0.3.17 to 0.3.18 * @return Boolean diff --git a/includes/definitions.php b/includes/definitions.php index 7ccfe9f..ae527d4 100755 --- a/includes/definitions.php +++ b/includes/definitions.php @@ -3,7 +3,7 @@ define('AVAILABLE_CABLE_END_ID_COUNT', 100); define('MAX_WALLJACK_PORTID', 100); define('DEFAULT_FLOORPLAN_IMG', 'floorplan-default.png'); -define('PCM_VERSION', '0.3.18'); +define('PCM_VERSION', '0.3.19'); define('NEW_OBJECT_PREFIX', 'Object_'); define('NEW_LOCATION_PREFIX', 'Location_'); diff --git a/install/Install.class.php b/install/Install.class.php index bf94a9a..9295a9f 100755 --- a/install/Install.class.php +++ b/install/Install.class.php @@ -37,7 +37,7 @@ class Install { * @var string $system_version - The version of the system */ var $system_version = '3.1.11'; -var $app_version = '0.3.18'; +var $app_version = '0.3.19'; /** * @var string $install_error - Contains the installation error @@ -784,7 +784,8 @@ var $install_error = array(); "5, 'SM-OS1', '4', 2, 0, 1", "6, 'MM-OM4', '2', 2, 0, 1", "7, 'MM-OM3', '2', 2, 0, 1", - "8, 'Unspecified', '5', 4, 0, 0" + "8, 'Unspecified', '5', 4, 0, 0", + "9, 'MM-OM1', '2', 2, 0, 1" ); // Add media type