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

0.3.12 - inventoryArray rework complete

Browse Source
This commit is contained in:
Garrett 2020-12-28 04:37:52 +00:00
parent 5bb2d9d0ea
commit 81cca94787
2 changed files with 13 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
assets/pages/jquery.explore.js
View File

@ -303,7 +303,7 @@ function retrievePortOptions(objID, objFace, partitionDepth, portID){
$('#checkboxPopulated').prop("disabled", true); $('#checkboxPopulated').prop("disabled", true);
} }
$(document).data('peerPortID', responseJSON.success.peerPortID); $(document).data('peerPortArray', responseJSON.success.peerPortArray);
} }
}); });
} }
@ -336,39 +336,6 @@ function processPortSelection(){
} }
}); });
/* // Retrieve the selected port details
$.post('backend/retrieve_port_details.php', {data:data}, function(response){
var responseJSON = JSON.parse(response);
if($(responseJSON.error).size() > 0) {
displayError(responseJSON.error);
} else {
$('#checkboxPopulated').prop("checked", responseJSON.success.populatedChecked);
$('#checkboxPopulated').prop("disabled", responseJSON.success.populatedDisabled);
$('#selectPort').html(responseJSON.success.portOptions);
if(responseJSON.success.portOptions != '') {
$('#selectPort').prop("disabled", false);
$('#selectPort').off('change');
$('#selectPort').on('change', function(){
var portID = parseInt($(this).children('option:selected').val(), 10);
$(document).data('clickedObjPortID', portID);
processPortSelection();
$(document).data('portClickedFlag', true);
handlePathFindButton();
});
} else {
$('#selectPort').prop("disabled", true);
$('#checkboxPopulated').prop("checked", false);
$('#checkboxPopulated').prop("disabled", true);
}
$(document).data('peerPortID', responseJSON.success.peerPortID);
}
}); */
// Clear selected object data for pathFinder remote object // Clear selected object data for pathFinder remote object
var data = { var data = {
objID: 0, objID: 0,
@ -727,7 +694,7 @@ function postProcessCable(){
$('#objTree').jstree('deselect_all'); $('#objTree').jstree('deselect_all');
$('#objectTreeModal').modal('hide'); $('#objectTreeModal').modal('hide');
$(document).data('peerPortID', value); $(document).data('peerPortArray', value);
} }
}); });
} }
@ -1180,10 +1147,10 @@ $( document ).ready(function() {
} }
}) })
.on('refresh.jstree', function(){ .on('refresh.jstree', function(){
var peerPortID = $(document).data('peerPortID'); var peerPortArray = $(document).data('peerPortArray');
$('#objTree').jstree('deselect_all'); $('#objTree').jstree('deselect_all');
$('#objTree').jstree('select_node', peerPortID); $('#objTree').jstree('select_node', peerPortArray);
var selectedNodes = $('#objTree').jstree('get_selected'); var selectedNodes = $('#objTree').jstree('get_selected');
if(selectedNodes.length) { if(selectedNodes.length) {

14
backend/retrieve_port_details.php
View File

@ -27,11 +27,15 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
$objType = $template['templateType']; $objType = $template['templateType'];
$objFunction = $template['templateFunction']; $objFunction = $template['templateFunction'];
$peerPortArray = array();
// Retrieve peer port ID // Retrieve peer port ID
if($peerData = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort]) { if(isset($qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort])) {
$peerPortID = '4-'.$peerData['id'].'-'.$peerData['face'].'-'.$peerData['depth'].'-'.$peerData['port']; $port = $qls->App->inventoryArray[$objID][$objFace][$objDepth][$objPort];
} else { foreach($port as $connection) {
$peerPortID = ''; $peerPortID = '4-'.$connection['id'].'-'.$connection['face'].'-'.$connection['depth'].'-'.$connection['port'];
array_push($peerPortArray, $peerPortID);
}
} }
// Retrieve trunked state // Retrieve trunked state
@ -86,7 +90,7 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
// Compile response data // Compile response data
$returnData = array( $returnData = array(
'portOptions' => $portOptions, 'portOptions' => $portOptions,
'peerPortID' => $peerPortID, 'peerPortArray' => $peerPortArray,
'populatedChecked' => $populatedChecked, 'populatedChecked' => $populatedChecked,
'populatedDisabled' => $populatedDisabled 'populatedDisabled' => $populatedDisabled
); );