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

Merge branch 'fix/integration-of-imported-nodes-209'

Browse source 
fixes #209
This commit is contained in:
Johannes Meyer 2019-02-28 09:01:45 +01:00
commit ba08817981
4 changed files with 83 additions and 12 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[]
*/

31
library/Businessprocess/Renderer/Renderer.php
View file

@ -5,6 +5,7 @@ namespace Icinga\Module\Businessprocess\Renderer;
use Icinga\Exception\ProgrammingError;
use Icinga\Module\Businessprocess\BpNode;
use Icinga\Module\Businessprocess\BpConfig;
use Icinga\Module\Businessprocess\ImportedNode;
use Icinga\Module\Businessprocess\Node;
use Icinga\Module\Businessprocess\Web\Url;
use ipl\Html\BaseHtmlElement;
@ -196,6 +197,36 @@ abstract class Renderer extends HtmlDocument
return $classes;
}
/**
* Return the url to the given node's source configuration
*
* @param BpNode $node
*
* @return Url
*/
public function getSourceUrl(BpNode $node)
{
if ($node instanceof ImportedNode) {
$name = $node->getNodeName();
$paths = $node->getBpConfig()->getBpNode($name)->getPaths();
} else {
$name = $node->getName();
$paths = $node->getPaths();
}
$url = $this->getUrl()->setParams([
'config' => $node->getBpConfig()->getName(),
'node' => $name
]);
// This depends on the fact that the node's root path is the last element in $paths
$url->getParams()->addValues('path', array_slice(array_pop($paths), 0, -1));
if (! $this->isLocked()) {
$url->getParams()->add('unlocked', true);
}
return $url;
}
/**
* @param Node $node
* @param $path

15
library/Businessprocess/Renderer/TileRenderer/NodeTile.php
View file

@ -197,6 +197,20 @@ class NodeTile extends BaseHtmlElement
],
Html::tag('i', ['class' => 'icon icon-sitemap'])
));
if ($node->getBpConfig()->getName() !== $this->renderer->getBusinessProcess()->getName()) {
$this->actions()->add(Html::tag(
'a',
[
'data-base-target' => '_next',
'href' => $this->renderer->getSourceUrl($node)->getAbsoluteUrl(),
'title' => mt(
'businessprocess',
'Show this process as part of its original configuration'
)
],
Html::tag('i', ['class' => 'icon icon-forward'])
));
}
$url = $node->getInfoUrl();
@ -279,6 +293,7 @@ class NodeTile extends BaseHtmlElement
}
if (! $this->renderer->getBusinessProcess()->getMetadata()->canModify()
|| $this->node->getBpConfig()->getName() !== $this->renderer->getBusinessProcess()->getName()
|| $this->node->getName() === '__unbound__'
) {
return;

10
library/Businessprocess/Renderer/TreeRenderer.php
View file

@ -147,7 +147,9 @@ class TreeRenderer extends Renderer
[
'id' => $htmlId,
'class' => ['bp', 'movable', $node->getObjectClassName()],
'data-node-name' => $node->getName()
'data-node-name' => $node instanceof ImportedNode
? $node->getNodeName()
: $node->getName()
]
);
$attributes = $li->getAttributes();
@ -180,6 +182,12 @@ class TreeRenderer extends Renderer
$differentConfig = $node->getBpConfig()->getName() !== $this->getBusinessProcess()->getName();
if (! $this->isLocked() && !$differentConfig) {
$div->add($this->getActionIcons($bp, $node));
} elseif ($differentConfig) {
$div->add($this->actionIcon(
'forward',
$this->getSourceUrl($node)->addParams(['mode' => 'tree'])->getAbsoluteUrl(),
mt('businessprocess', 'Show this process as part of its original configuration')
)->addAttributes(['data-base-target' => '_next']));
}
$ul = Html::tag('ul', [