diff --git a/extensions/custis/lib/BugWorkTime.pm b/extensions/custis/lib/BugWorkTime.pm index bd8a6fac7..47573b6bd 100644 --- a/extensions/custis/lib/BugWorkTime.pm +++ b/extensions/custis/lib/BugWorkTime.pm @@ -67,7 +67,7 @@ sub DistributeWorktime { $nt = $sum ? $t*$propo->{$_}/$sum : $t/$n; $nt = int($nt*100)/100; - if (abs($nt) < $min_inc || ($nt < 0) == ($sum > 0)) + if (abs($nt) < $min_inc || $t*$nt < 0) { # не размазываем время совсем уж мелкими суммами # и размазываем только суммами того же знака, что и вся сумма diff --git a/extensions/custis/lib/CustisBuglistHooks.pm b/extensions/custis/lib/CustisBuglistHooks.pm index f808b969b..a82768071 100644 --- a/extensions/custis/lib/CustisBuglistHooks.pm +++ b/extensions/custis/lib/CustisBuglistHooks.pm @@ -13,16 +13,6 @@ sub buglist_static_columns my $columns = $args->{columns}; my $dbh = Bugzilla->dbh; - $columns->{dependson} = { - name => "(SELECT ".$dbh->sql_group_concat('bugblockers.dependson', "','")." FROM dependencies bugblockers WHERE bugblockers.blocked=bugs.bug_id)", - title => "Bug dependencies", - }; - - $columns->{blocked} = { - name => "(SELECT ".$dbh->sql_group_concat('bugblocked.blocked', "','")." FROM dependencies bugblocked WHERE bugblocked.dependson=bugs.bug_id)", - title => "Bugs blocked", - }; - $columns->{flags} = { name => "(SELECT ".$dbh->sql_group_concat($dbh->sql_string_concat('col_ft.name', 'col_f.status'), "', '")."