Merge pull request #12568 from atm-john/develop_fix_divide_by_zero

Fix division by zero
This commit is contained in:
Laurent Destailleur 2019-11-30 23:29:11 +01:00 committed by GitHub
commit 7931bfa766
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -2088,14 +2088,15 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
}
$out .= '</span>';
$out .= ' <div class="progress sm '.$spaced.'">';
$diffval = doubleval($task->progress) - doubleval($progressCalculated);
if ($diffval >= 0) {
// good
$out .= ' <div class="progress-bar '.$progressBarClass.'" style="width: '.doubleval($task->progress).'%" title="'.doubleval($task->progress).'%">';
$out .= ' <div class="progress-bar progress-bar-consumed" style="width: '.doubleval($progressCalculated / $task->progress * 100).'%" title="'.doubleval($progressCalculated).'%"></div>';
if(!empty($task->progress)) {
$out .= ' <div class="progress-bar progress-bar-consumed" style="width: ' . doubleval($progressCalculated / $task->progress * 100) . '%" title="' . doubleval($progressCalculated) . '%"></div>';
}
$out .= ' </div>';
}
else