From 7a8c48c7e844f60d866202075290910d9148fd8d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 14 Feb 2019 15:32:51 +0100 Subject: [PATCH] Fix a few style issues --- application/forms/AddNodeForm.php | 6 +++--- application/forms/MoveNodeForm.php | 2 +- configuration.php | 2 +- library/Businessprocess/ImportedNode.php | 9 ++++----- library/Businessprocess/Renderer/TreeRenderer.php | 4 +++- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/application/forms/AddNodeForm.php b/application/forms/AddNodeForm.php index 2efa1b0..ad24cc0 100644 --- a/application/forms/AddNodeForm.php +++ b/application/forms/AddNodeForm.php @@ -189,7 +189,7 @@ class AddNodeForm extends QuickForm protected function selectHost() { - $this->addElement('multiselect','children', [ + $this->addElement('multiselect', 'children', [ 'label' => $this->translate('Hosts'), 'required' => true, 'size' => 8, @@ -225,7 +225,7 @@ class AddNodeForm extends QuickForm protected function addServicesElement($host) { - $this->addElement('multiselect','children', [ + $this->addElement('multiselect', 'children', [ 'label' => $this->translate('Services'), 'required' => true, 'size' => 8, @@ -260,7 +260,7 @@ class AddNodeForm extends QuickForm } if (($file = $this->getSentValue('file')) || !$this->hasParentNode()) { - $this->addElement('multiselect','children', [ + $this->addElement('multiselect', 'children', [ 'label' => $this->translate('Process nodes'), 'required' => true, 'size' => 8, diff --git a/application/forms/MoveNodeForm.php b/application/forms/MoveNodeForm.php index d261eac..5ec2ed9 100644 --- a/application/forms/MoveNodeForm.php +++ b/application/forms/MoveNodeForm.php @@ -57,7 +57,7 @@ class MoveNodeForm extends QuickForm 'filters' => ['Null'], 'validators' => [ ['Callback', true, [ - 'callback' => function($name) { + 'callback' => function ($name) { return empty($name) || $this->bp->hasBpNode($name); }, 'messages' => [ diff --git a/configuration.php b/configuration.php index 724c23c..38ef46a 100644 --- a/configuration.php +++ b/configuration.php @@ -62,4 +62,4 @@ $this->provideJsFile('vendor/Sortable.js'); $this->provideJsFile('behavior/sortable.js'); $this->provideJsFile('vendor/jquery.fn.sortable.js'); -$this->provideCssFile('state-ball.less'); \ No newline at end of file +$this->provideCssFile('state-ball.less'); diff --git a/library/Businessprocess/ImportedNode.php b/library/Businessprocess/ImportedNode.php index 22c244f..cf40346 100644 --- a/library/Businessprocess/ImportedNode.php +++ b/library/Businessprocess/ImportedNode.php @@ -31,11 +31,10 @@ class ImportedNode extends BpNode $this->nodeName = $object->node; parent::__construct((object) [ - 'name' => '@' . $this->configName . ':' . $this->nodeName, - 'operator' => null, - 'child_names' => null - ] - ); + 'name' => '@' . $this->configName . ':' . $this->nodeName, + 'operator' => null, + 'child_names' => null + ]); } /** diff --git a/library/Businessprocess/Renderer/TreeRenderer.php b/library/Businessprocess/Renderer/TreeRenderer.php index 7284ae6..54e6345 100644 --- a/library/Businessprocess/Renderer/TreeRenderer.php +++ b/library/Businessprocess/Renderer/TreeRenderer.php @@ -175,7 +175,9 @@ class TreeRenderer extends Renderer $ul = Html::tag('ul', [ 'class' => ['bp', 'sortable'], - 'data-sortable-disabled' => $this->isLocked() || $node->getBpConfig()->getName() !== $this->getBusinessProcess()->getName() ? 'true' : 'false', + 'data-sortable-disabled' => ( + $this->isLocked() || $node->getBpConfig()->getName() !== $this->getBusinessProcess()->getName() + ) ? 'true' : 'false', 'data-sortable-invert-swap' => 'true', 'data-sortable-data-id-attr' => 'id', 'data-sortable-draggable' => '.movable',