mkrieger/patchcablemgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.19

Browse Source
This commit is contained in:
Garrett 2021-09-26 04:18:01 +00:00
parent ea88d95a14
commit 12c0080b3d
6 changed files with 57 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG
View File

@ -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

2
README.md
View File

@ -1 +1 @@
# 0.3.18
# 0.3.19

50
backend/retrieve_floorplan_object_details.php
View File

@ -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);
}
}
}
}

19
includes/Update.class.php
View File

@ -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

2
includes/definitions.php
View File

@ -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_');

5
install/Install.class.php
View File

@ -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