0.3.14
This commit is contained in:
parent
6b5f8c8927
commit
9f4637b596
@ -25,6 +25,17 @@ if($_SERVER['REQUEST_METHOD'] == 'POST'){
|
|||||||
|
|
||||||
// Create $path
|
// Create $path
|
||||||
include_once $_SERVER['DOCUMENT_ROOT'].'/includes/content-path2.php';
|
include_once $_SERVER['DOCUMENT_ROOT'].'/includes/content-path2.php';
|
||||||
|
|
||||||
|
$pathDiverges = false;
|
||||||
|
foreach($pathArray as $connection) {
|
||||||
|
foreach($connection as $side) {
|
||||||
|
foreach($side as $port) {
|
||||||
|
$pathDiverges = ($port['portDiverges'] or $pathDiverges);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$validate->returnData['data']['pathDiverges'] = $pathDiverges;
|
||||||
|
|
||||||
$validate->returnData['success'] = $qls->App->buildPathFull2($pathArray);
|
$validate->returnData['success'] = $qls->App->buildPathFull2($pathArray);
|
||||||
error_log('Debug (pathArray): '.json_encode($pathArray));
|
error_log('Debug (pathArray): '.json_encode($pathArray));
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1991,13 +1991,16 @@ var $qls;
|
|||||||
$objDepth = $port['objDepth'];
|
$objDepth = $port['objDepth'];
|
||||||
$objPort = $port['objPort'];
|
$objPort = $port['objPort'];
|
||||||
$selected = ($port['selected'] == true) ? true : $selected;
|
$selected = ($port['selected'] == true) ? true : $selected;
|
||||||
|
$portDiverges = $port['portDiverges'];
|
||||||
$cableLength = $port['length'];
|
$cableLength = $port['length'];
|
||||||
$mediaTypeID = $port['mediaTypeID'];
|
$mediaTypeID = $port['mediaTypeID'];
|
||||||
$connectorTypeID = $port['connectorTypeID'];
|
$connectorTypeID = $port['connectorTypeID'];
|
||||||
$populated = (isset($this->populatedPortArray[$objID][$objFace][$objDepth][$objPort])) ? true : $populated;
|
$populated = (isset($this->populatedPortArray[$objID][$objFace][$objDepth][$objPort])) ? true : $populated;
|
||||||
|
|
||||||
|
if(!$portDiverges) {
|
||||||
$objName .= $this->generateObjectPortName($objID, $objFace, $objDepth, $objPort).'<br>';
|
$objName .= $this->generateObjectPortName($objID, $objFace, $objDepth, $objPort).'<br>';
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Compile port name(s) in an object box
|
// Compile port name(s) in an object box
|
||||||
$htmlPort = $this->wrapObject($objID, $objName, $selected, $trunkPairID);
|
$htmlPort = $this->wrapObject($objID, $objName, $selected, $trunkPairID);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user