Skip to content

Commit

Permalink
add canceled downtimes to the history, if they were started (#5184)
Browse files Browse the repository at this point in the history
fixes #5176
  • Loading branch information
Robnarok authored Apr 5, 2024
1 parent d6881e0 commit dba77bc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function joinBaseTables()
{
parent::joinBaseTables(true);
$this->select->where(
"hdh.actual_end_time > '1970-01-02 00:00:00' AND hdh.was_started = 1 AND hdh.was_cancelled = 0"
"hdh.actual_end_time > '1970-01-02 00:00:00' AND hdh.was_started = 1"
);
$this->columnMap['downtimehistory']['type'] = "('dt_end')";
$this->columnMap['downtimehistory']['timestamp'] = str_replace(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ protected function joinBaseTables()
);
}
$this->select->where(
"hdh.was_started = 1 AND hdh.was_cancelled = 0"
"hdh.was_started = 1"
);
$this->joinedVirtualTables['downtimehistory'] = true;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ protected function joinBaseTables()
{
parent::joinBaseTables(true);
$this->select->where(
"sdh.actual_end_time > '1970-01-02 00:00:00' AND sdh.was_started = 1 AND sdh.was_cancelled = 0"
"sdh.actual_end_time > '1970-01-02 00:00:00' AND sdh.was_started = 1"
);
$this->columnMap['downtimehistory']['type'] = "('dt_end')";
$this->columnMap['downtimehistory']['timestamp'] = str_replace(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ protected function joinBaseTables()
);
}
$this->select->where(
"sdh.was_started = 1 AND sdh.was_cancelled = 0"
"sdh.was_started = 1"
);

$this->joinedVirtualTables['downtimehistory'] = true;
Expand Down

0 comments on commit dba77bc

Please sign in to comment.