From 9746ebf8f19046cca1a01d4f3277ec7bf02e0595 Mon Sep 17 00:00:00 2001 From: Frank Brendel Date: Fri, 15 Mar 2019 11:42:43 +0100 Subject: [PATCH] Monit, remove __items and fix migration issue (#3336) --- .../mvc/app/models/OPNsense/Monit/Migrations/M1_0_8.php | 2 +- src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_8.php b/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_8.php index 4e779dff7..4b2147ce1 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_8.php +++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Migrations/M1_0_8.php @@ -35,7 +35,7 @@ class M1_0_8 extends BaseModelMigration { public function post($model) { - foreach ($model->getNodeByReference('test')->__items as $test) { + foreach ($model->test->iterateItems() as $test) { $test->type = $model->getTestType($test->condition->getNodeData()); } // validation will fail because we want to change the type of tests linked to services diff --git a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php index baec8e841..690b92361 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php +++ b/src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php @@ -168,7 +168,8 @@ class Monit extends BaseModel switch ($node->getInternalXMLTagName()) { case 'type': $testUuid = $parentNode->getAttribute('uuid'); - if ($node->isFieldChanged() && + if (strcmp((string)$node, 'Custom') != 0 && + $node->isFieldChanged() && $this->isTestServiceRelated($testUuid)) { $messages->appendMessage(new \Phalcon\Validation\Message( gettext("Cannot change the type. Test is linked to a service."),