parent
816f26888f
commit
f7d1444fd9
|
@ -224,7 +224,10 @@ class IcingaHostForm extends DirectorObjectForm
|
|||
'name' => 'object_name',
|
||||
'display' => 'COALESCE(display_name, object_name)'
|
||||
)
|
||||
)->where('object_type = ?', 'object')->order('display');
|
||||
)->where(
|
||||
'object_type IN (?)',
|
||||
array('object', 'external_object')
|
||||
)->order('display');
|
||||
|
||||
return $db->fetchPairs($select);
|
||||
}
|
||||
|
|
|
@ -0,0 +1,6 @@
|
|||
ALTER TABLE icinga_hostgroup
|
||||
MODIFY object_type enum('object', 'template', 'external_object') NOT NULL;
|
||||
|
||||
INSERT INTO director_schema_migration
|
||||
(schema_version, migration_time)
|
||||
VALUES (130, NOW());
|
|
@ -730,7 +730,7 @@ CREATE TABLE icinga_service_set_var (
|
|||
CREATE TABLE icinga_hostgroup (
|
||||
id INT(10) UNSIGNED AUTO_INCREMENT NOT NULL,
|
||||
object_name VARCHAR(255) NOT NULL,
|
||||
object_type ENUM('object', 'template') NOT NULL,
|
||||
object_type ENUM('object', 'template', 'external_object') NOT NULL,
|
||||
disabled ENUM('y', 'n') NOT NULL DEFAULT 'n',
|
||||
display_name VARCHAR(255) DEFAULT NULL,
|
||||
assign_filter TEXT DEFAULT NULL,
|
||||
|
@ -1508,4 +1508,4 @@ CREATE TABLE icinga_user_resolved_var (
|
|||
|
||||
INSERT INTO director_schema_migration
|
||||
(schema_version, migration_time)
|
||||
VALUES (129, NOW());
|
||||
VALUES (130, NOW());
|
||||
|
|
Loading…
Reference in New Issue