Commit 98a85abf authored by Ad Schellevis's avatar Ad Schellevis

(traffic shaper) change to new validation behavior

parent d3fe1cff
...@@ -57,10 +57,7 @@ class SettingsController extends ApiControllerBase ...@@ -57,10 +57,7 @@ class SettingsController extends ApiControllerBase
// replace absolute path to attribute for relative one at uuid. // replace absolute path to attribute for relative one at uuid.
if ($node != null) { if ($node != null) {
$fieldnm = str_replace($node->__reference, $reference, $msg->getField()); $fieldnm = str_replace($node->__reference, $reference, $msg->getField());
if ($fieldnm != $msg->getField()) {
// only collect validation errors for the item we're currently editing.
$result["validations"][$fieldnm] = $msg->getMessage(); $result["validations"][$fieldnm] = $msg->getMessage();
}
} else { } else {
$result["validations"][$msg->getField()] = $msg->getMessage(); $result["validations"][$msg->getField()] = $msg->getMessage();
} }
...@@ -68,10 +65,9 @@ class SettingsController extends ApiControllerBase ...@@ -68,10 +65,9 @@ class SettingsController extends ApiControllerBase
// serialize model to config and save when there are no validation errors // serialize model to config and save when there are no validation errors
if (count($result['validations']) == 0) { if (count($result['validations']) == 0) {
// we've already performed a validation, prevent issues from other items in the model reflecting back to us.
$mdlShaper->serializeToConfig($disable_validation = true);
// save config if validated correctly // save config if validated correctly
$mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
$result = array("result" => "saved"); $result = array("result" => "saved");
} }
...@@ -151,7 +147,7 @@ class SettingsController extends ApiControllerBase ...@@ -151,7 +147,7 @@ class SettingsController extends ApiControllerBase
if ($uuid != null) { if ($uuid != null) {
if ($mdlShaper->pipes->pipe->del($uuid)) { if ($mdlShaper->pipes->pipe->del($uuid)) {
// if item is removed, serialize to config and save // if item is removed, serialize to config and save
$mdlShaper->serializeToConfig($disable_validation = true); $mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
$result['result'] = 'deleted'; $result['result'] = 'deleted';
} else { } else {
...@@ -186,7 +182,7 @@ class SettingsController extends ApiControllerBase ...@@ -186,7 +182,7 @@ class SettingsController extends ApiControllerBase
} }
$result['result'] = $node->enabled; $result['result'] = $node->enabled;
// if item has toggled, serialize to config and save // if item has toggled, serialize to config and save
$mdlShaper->serializeToConfig($disable_validation = true); $mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
} }
} }
...@@ -334,7 +330,7 @@ class SettingsController extends ApiControllerBase ...@@ -334,7 +330,7 @@ class SettingsController extends ApiControllerBase
if ($uuid != null) { if ($uuid != null) {
if ($mdlShaper->queues->queue->del($uuid)) { if ($mdlShaper->queues->queue->del($uuid)) {
// if item is removed, serialize to config and save // if item is removed, serialize to config and save
$mdlShaper->serializeToConfig($disable_validation = true); $mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
$result['result'] = 'deleted'; $result['result'] = 'deleted';
} else { } else {
...@@ -369,7 +365,7 @@ class SettingsController extends ApiControllerBase ...@@ -369,7 +365,7 @@ class SettingsController extends ApiControllerBase
} }
$result['result'] = $node->enabled; $result['result'] = $node->enabled;
// if item has toggled, serialize to config and save // if item has toggled, serialize to config and save
$mdlShaper->serializeToConfig($disable_validation = true); $mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
} }
} }
...@@ -483,7 +479,7 @@ class SettingsController extends ApiControllerBase ...@@ -483,7 +479,7 @@ class SettingsController extends ApiControllerBase
if ($uuid != null) { if ($uuid != null) {
if ($mdlShaper->rules->rule->del($uuid)) { if ($mdlShaper->rules->rule->del($uuid)) {
// if item is removed, serialize to config and save // if item is removed, serialize to config and save
$mdlShaper->serializeToConfig($disable_validation = true); $mdlShaper->serializeToConfig();
Config::getInstance()->save(); Config::getInstance()->save();
$result['result'] = 'deleted'; $result['result'] = 'deleted';
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment