lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanups for https://github.com/opnsense/core/pull/3267

Browse Source
This commit is contained in:
Ad Schellevis 2019-03-06 15:46:48 +01:00
parent 3d7e84eae4
commit eb280f61fc
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/mvc/app/models/OPNsense/Monit/Monit.php
View File

@ -167,10 +167,8 @@ class Monit extends BaseModel
// test node validations
switch ($node->getInternalXMLTagName()) {
case 'type':
// only 'Custom' is allowed if test is linked to a service
$testUuid = $parentNode->getAttribute('uuid');
if (strcmp((string)$node, 'Custom') != 0 &&
$node->isFieldChanged() &&
if ($node->isFieldChanged() &&
$this->isTestServiceRelated($testUuid)) {
$messages->appendMessage(new \Phalcon\Validation\Message(
gettext("Cannot change the type. Test is linked to a service."),
@ -179,7 +177,8 @@ class Monit extends BaseModel
}
break;
case 'condition':
// only 'Custom' or the same test type (from condition) allowed if test is linked to a service
// only 'Custom' or the same test type (see $conditionPatterns)
// are allowed if test is linked to a service
$type = $this->getTestType((string)$node);
if (strcmp($type, 'Custom') != 0 &&
strcmp((string)$parentNode->type, $type) != 0 &&