tyler.durden
/
icingaweb2-module-director
mirror of https://github.com/Icinga/icingaweb2-module-director.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DirectorObjectForm: centralize field priority 

fixes #2041
This commit is contained in:
Thomas Gelf 2020-11-30 12:39:48 +01:00
parent a2f294fea2
commit 637315d5e2
10 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/IcingaAddServiceForm.php
View File

@ -63,7 +63,7 @@ class IcingaAddServiceForm extends DirectorObjectForm
['HtmlTag', ['tag' => 'dl']],
'Fieldset',
],
'order' => 20,
'order' => self::GROUP_ORDER_OBJECT_DEFINITION,
'legend' => $this->translate('Main properties')
]);

2
application/forms/IcingaCommandForm.php
View File

@ -107,7 +107,7 @@ class IcingaCommandForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Zone settings')
));

4
application/forms/IcingaDependencyForm.php
View File

@ -57,7 +57,7 @@ class IcingaDependencyForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Zone settings')
));
@ -264,7 +264,7 @@ class IcingaDependencyForm extends DirectorObjectForm
['HtmlTag', ['tag' => 'dl']],
'Fieldset',
],
'order' => 25,
'order' => self::GROUP_ORDER_RELATED_OBJECTS,
'legend' => $this->translate('Related Objects')
]);

2
application/forms/IcingaHostForm.php
View File

@ -131,7 +131,7 @@ class IcingaHostForm extends DirectorObjectForm
['HtmlTag', ['tag' => 'dl']],
'Fieldset',
],
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Icinga Agent and zone settings')
]);

2
application/forms/IcingaNotificationForm.php
View File

@ -61,7 +61,7 @@ class IcingaNotificationForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Zone settings')
));

4
application/forms/IcingaServiceForm.php
View File

@ -165,7 +165,7 @@ class IcingaServiceForm extends DirectorObjectForm
['HtmlTag', ['tag' => 'dl']],
'DtDdWrapper',
],
'order' => 1000,
'order' => self::GROUP_ORDER_BUTTONS,
]);
}
}
@ -686,7 +686,7 @@ class IcingaServiceForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 40,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Icinga Agent and zone settings')
));

4
application/forms/IcingaUserForm.php
View File

@ -72,7 +72,7 @@ class IcingaUserForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Zone settings')
));
@ -190,7 +190,7 @@ class IcingaUserForm extends DirectorObjectForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 20,
'order' => self::GROUP_ORDER_OBJECT_DEFINITION,
'legend' => $this->translate('User properties')
));
}

2
application/forms/IcingaUserGroupForm.php
View File

@ -38,7 +38,7 @@ class IcingaUserGroupForm extends DirectorObjectForm
['HtmlTag', ['tag' => 'dl']],
'Fieldset',
],
'order' => 80,
'order' => self::GROUP_ORDER_CLUSTERING,
'legend' => $this->translate('Zone settings')
]);

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

@ -23,6 +23,16 @@ use Zend_Form_Element_Select as ZfSelect;
abstract class DirectorObjectForm extends DirectorForm
{
const GROUP_ORDER_OBJECT_DEFINITION = 20;
const GROUP_ORDER_RELATED_OBJECTS = 25;
const GROUP_ORDER_ASSIGN = 30;
const GROUP_ORDER_CUSTOM_FIELDS = 50;
const GROUP_ORDER_CUSTOM_FIELD_CATEGORIES = 60;
const GROUP_ORDER_EVENT_FILTERS = 700;
const GROUP_ORDER_EXTRA_INFO = 750;
const GROUP_ORDER_CLUSTERING = 800;
const GROUP_ORDER_BUTTONS = 1000;
/** @var IcingaObject */
protected $object;
@ -572,7 +582,7 @@ abstract class DirectorObjectForm extends DirectorForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 20,
'order' => self::GROUP_ORDER_OBJECT_DEFINITION,
'legend' => $this->translate('Main properties')
));
@ -1551,7 +1561,7 @@ abstract class DirectorObjectForm extends DirectorForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 75,
'order' => self::GROUP_ORDER_EXTRA_INFO,
'legend' => $this->translate('Additional properties')
));
@ -1584,7 +1594,7 @@ abstract class DirectorObjectForm extends DirectorForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' => 30,
'order' => self::GROUP_ORDER_ASSIGN,
'legend' => $this->translate('Assign where')
));
@ -1653,7 +1663,7 @@ abstract class DirectorObjectForm extends DirectorForm
array('HtmlTag', array('tag' => 'dl')),
'Fieldset',
),
'order' =>70,
'order' => self::GROUP_ORDER_EVENT_FILTERS,
'legend' => $this->translate('State and transition type filters')
));

4
library/Director/Web/Form/IcingaObjectFieldLoader.php
View File

@ -255,14 +255,14 @@ class IcingaObjectFieldLoader
$form->addElementsToGroup(
[$element],
'custom_fields:' . $category->get('category_name'),
51 + $prioIdx[$key],
DirectorObjectForm::GROUP_ORDER_CUSTOM_FIELD_CATEGORIES + $prioIdx[$key],
$category->get('category_name')
);
} else {
$form->addElementsToGroup(
[$element],
'custom_fields',
50,
DirectorObjectForm::GROUP_ORDER_CUSTOM_FIELDS,
$form->translate('Custom properties')
);
}