tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 01:04:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

DirectorObjectForm: handle ordering before setup

Browse Source
This commit is contained in:
Thomas Gelf 2016-03-22 01:34:21 +01:00
parent 970d2aa435
commit 712dc6c9b7
1 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
library/Director/Web/Form/DirectorObjectForm.php
View File

@ -711,6 +711,35 @@ abstract class DirectorObjectForm extends QuickForm
list($set[$key + 1], $set[$key]) = array($set[$key], $set[$key + 1]); list($set[$key + 1], $set[$key]) = array($set[$key], $set[$key + 1]);
} }
protected function beforeSetup()
{
if (!$this->hasBeenSent()) {
return;
}
$post = $values = $this->getRequest()->getPost();
foreach ($post as $key => $value) {
if (preg_match('/^(.+?)_(\d+)__(MOVE_DOWN|MOVE_UP|REMOVE)$/', $key, $m)) {
$values[$m[1]] = array_filter($values[$m[1]], 'strlen');
switch ($m[3]) {
case 'MOVE_UP':
$this->moveUpInSet($values[$m[1]], $m[2]);
break;
case 'MOVE_DOWN':
$this->moveDownInSet($values[$m[1]], $m[2]);
break;
case 'REMOVE':
$this->removeFromSet($values[$m[1]], $m[2]);
break;
}
$this->getRequest()->setPost($m[1], $values[$m[1]]);
}
}
}
protected function onRequest() protected function onRequest()
{ {
$values = array(); $values = array();
@ -729,26 +758,6 @@ abstract class DirectorObjectForm extends QuickForm
$values[$key] = $value; $values[$key] = $value;
} }
} }
foreach ($post as $key => $value) {
if (preg_match('/^(.+?)_(\d+)__(MOVE_DOWN|MOVE_UP|REMOVE)$/', $key, $m)) {
$values[$m[1]] = array_filter($values[$m[1]], 'strlen');
switch ($m[3]) {
case 'MOVE_UP':
$this->moveUpInSet($values[$m[1]], $m[2]);
break;
case 'MOVE_DOWN':
$this->moveDownInSet($values[$m[1]], $m[2]);
break;
case 'REMOVE':
$this->removeFromSet($values[$m[1]], $m[2]);
break;
}
$this->getRequest()->setPost($m[1], $values[$m[1]]);
}
}
} }
if ($object instanceof IcingaObject) { if ($object instanceof IcingaObject) {
$this->handleProperties($object, $values); $this->handleProperties($object, $values);