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

MVC: refactor ConfigdActionsField, skip unit test since we don't want to mock configd at the moment. for https://github.com/opnsense/core/issues/3252

Browse Source
This commit is contained in:
Ad Schellevis 2019-11-08 11:16:52 +01:00
parent f5b5d0def7
commit f0e6e1e89f
1 changed files with 9 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/opnsense/mvc/app/models/OPNsense/Base/FieldTypes/ConfigdActionsField.php
View File

@ -1,7 +1,7 @@
<?php
/**
* Copyright (C) 2015 Deciso B.V.
* Copyright (C) 2015-2019 Deciso B.V.
*
* All rights reserved.
*
@ -36,17 +36,12 @@ use Phalcon\Validation\Validator\InclusionIn;
* Class ConfigdActionsField list configurable configd actions
* @package OPNsense\Base\FieldTypes
*/
class ConfigdActionsField extends BaseField
class ConfigdActionsField extends BaseListField
{
/**
* @var bool marks if this is a data node or a container
*/
protected $internalIsContainer = false;
/**
* @var array collected options
*/
private static $internalOptionList = array();
private static $internalStaticOptionList = array();
/**
* @var string default validation message string
@ -68,8 +63,8 @@ class ConfigdActionsField extends BaseField
*/
protected function actionPostLoadingEvent()
{
if (!isset(self::$internalOptionList[$this->internalCacheKey])) {
self::$internalOptionList[$this->internalCacheKey] = array();
if (!isset(self::$internalStaticOptionList[$this->internalCacheKey])) {
self::$internalStaticOptionList[$this->internalCacheKey] = array();
$backend = new Backend();
$service_tempfile = "/tmp/configdmodelfield.data";
@ -90,7 +85,6 @@ class ConfigdActionsField extends BaseField
}
}
foreach ($actions as $key => $value) {
// use filters to determine relevance
$isMatched = true;
@ -104,14 +98,15 @@ class ConfigdActionsField extends BaseField
}
if ($isMatched) {
if (!isset($value['description']) || $value['description'] == '') {
self::$internalOptionList[$this->internalCacheKey][$key] = $key;
self::$internalStaticOptionList[$this->internalCacheKey][$key] = $key;
} else {
self::$internalOptionList[$this->internalCacheKey][$key] = $value['description'];
self::$internalStaticOptionList[$this->internalCacheKey][$key] = $value['description'];
}
}
}
natcasesort(self::$internalOptionList[$this->internalCacheKey]);
natcasesort(self::$internalStaticOptionList[$this->internalCacheKey]);
}
$this->internalOptionList = self::$internalStaticOptionList[$this->internalCacheKey];
}
/**
@ -126,44 +121,4 @@ class ConfigdActionsField extends BaseField
$this->internalCacheKey = md5(serialize($this->internalFilters));
}
}
/**
* get valid options, descriptions and selected value
* @return array
*/
public function getNodeData()
{
$result = array();
// if interface is not required, add empty option
if (!$this->internalIsRequired) {
$result[""] = array("value" => gettext("none"), "selected" => 0);
}
foreach (self::$internalOptionList[$this->internalCacheKey] as $optKey => $optValue) {
if ($optKey == $this->internalValue) {
$selected = 1;
} else {
$selected = 0;
}
$result[$optKey] = array("value" => $optValue, "selected" => $selected);
}
return $result;
}
/**
* retrieve field validators for this field type
* @return array returns Text/regex validator
*/
public function getValidators()
{
$validators = parent::getValidators();
if ($this->internalValue != null) {
$validators[] = new InclusionIn(array('message' => $this->internalValidationMessage,
'domain'=>array_keys(self::$internalOptionList[$this->internalCacheKey])));
}
return $validators;
}
}