Ent 6879 separar en alertas de inventario el selector de grupos de acl del selector de grupos sobre el que se aplican las alertas
This commit is contained in:
parent
55f9ab6d57
commit
208c0d10e8
|
@ -1,6 +1,8 @@
|
|||
START TRANSACTION;
|
||||
|
||||
ALTER TABLE `tinventory_alert` ADD COLUMN `alert_groups` TEXT NOT NULL;
|
||||
UPDATE `tinventory_alert` t1 INNER JOIN `tinventory_alert` t2 ON t1.id = t2.id SET t1.alert_groups = t2.id_group;
|
||||
|
||||
ALTER TABLE `tnotification_source` ADD COLUMN `subtype_blacklist` TEXT;
|
||||
|
||||
COMMIT;
|
||||
|
||||
|
|
|
@ -363,6 +363,7 @@ CREATE TABLE IF NOT EXISTS `tinventory_alert`(
|
|||
`last_fired` text NOT NULL default '',
|
||||
`disable_event` tinyint(1) UNSIGNED default 0,
|
||||
`enabled` tinyint(1) UNSIGNED default 1,
|
||||
`alert_groups` text NOT NULL default '',
|
||||
PRIMARY KEY (`id`),
|
||||
FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
|
||||
ON DELETE CASCADE ON UPDATE CASCADE
|
||||
|
|
|
@ -2653,6 +2653,7 @@ CREATE TABLE IF NOT EXISTS `tinventory_alert`(
|
|||
`last_fired` text NOT NULL default '',
|
||||
`disable_event` tinyint(1) UNSIGNED default 0,
|
||||
`enabled` tinyint(1) UNSIGNED default 1,
|
||||
`alert_groups` text NOT NULL default '',
|
||||
PRIMARY KEY (`id`),
|
||||
FOREIGN KEY (`id_module_inventory`) REFERENCES tmodule_inventory(`id_module_inventory`)
|
||||
ON DELETE CASCADE ON UPDATE CASCADE
|
||||
|
|
|
@ -844,7 +844,7 @@ abstract class VisualConsoleItem<Props extends ItemProps> {
|
|||
|
||||
if (
|
||||
prevProps &&
|
||||
(this.props.isLinkEnabled && prevProps.link !== this.props.link)
|
||||
this.props.isLinkEnabled && prevProps.link !== this.props.link
|
||||
) {
|
||||
if (this.props.link !== null) {
|
||||
this.elementRef.setAttribute("href", this.props.link);
|
||||
|
|
|
@ -446,10 +446,14 @@ export default class Line extends Item<LineProps> {
|
|||
}
|
||||
|
||||
// Init the movement listeners.
|
||||
this.initStartPositionMovementListener(startCircle, this.elementRef
|
||||
.parentElement as HTMLElement);
|
||||
this.initEndPositionMovementListener(endCircle, this.elementRef
|
||||
.parentElement as HTMLElement);
|
||||
this.initStartPositionMovementListener(
|
||||
startCircle,
|
||||
this.elementRef.parentElement as HTMLElement
|
||||
);
|
||||
this.initEndPositionMovementListener(
|
||||
endCircle,
|
||||
this.elementRef.parentElement as HTMLElement
|
||||
);
|
||||
} else if (!this.moveMode) {
|
||||
this.stopStartPositionMovementListener();
|
||||
// Remove circles.
|
||||
|
|
Loading…
Reference in New Issue