upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-02-18 02:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

BpNode: Make sure to sort children alphabetically by default

Browse source
This commit is contained in:
Johannes Meyer 2019-02-28 08:53:54 +01:00
parent 2a82b326fe
commit fe991d7f58
1 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
library/Businessprocess/BpNode.php
View file

@ -116,8 +116,10 @@ class BpNode extends Node
$name
);
}
$this->children[$name] = $node;
$this->childNames[] = $name;
$this->reorderChildren();
$node->addParent($this);
return $this;
}
@ -425,13 +427,9 @@ class BpNode extends Node
public function setChildNames($names)
{
if (! $this->getBpConfig()->getMetadata()->isManuallyOrdered()) {
natcasesort($names);
$names = array_values($names);
}
$this->childNames = $names;
$this->children = null;
$this->reorderChildren();
return $this;
}
@ -449,12 +447,8 @@ class BpNode extends Node
public function getChildren($filter = null)
{
if ($this->children === null) {
$this->children = array();
if (! $this->getBpConfig()->getMetadata()->isManuallyOrdered()) {
$childNames = $this->getChildNames();
natcasesort($childNames);
$this->childNames = array_values($childNames);
}
$this->children = [];
$this->reorderChildren();
foreach ($this->getChildNames() as $name) {
$this->children[$name] = $this->getBpConfig()->getNode($name);
$this->children[$name]->addParent($this);
@ -464,6 +458,29 @@ class BpNode extends Node
return $this->children;
}
/**
* Reorder this node's children, in case manual order is not applied
*/
protected function reorderChildren()
{
if ($this->getBpConfig()->getMetadata()->isManuallyOrdered()) {
return;
}
$childNames = $this->getChildNames();
natcasesort($childNames);
$this->childNames = array_values($childNames);
if (! empty($this->children)) {
$children = [];
foreach ($this->childNames as $name) {
$children[$name] = $this->children[$name];
}
$this->children = $children;
}
}
/**
* return BpNode[]
*/