vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug 40933 - Rebuild chart data under super-user 

git-svn-id: svn://svn.office.custis.ru/3rdparty/bugzilla.org/trunk@1579 6955db30-a419-402b-8a0d-67ecbb4d7f56
master
vfilippov 2012-06-26 15:42:01 +00:00
parent 4994a0f4dc
commit 37ff06bfcc
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
collectstats.pl
View File

@ -45,6 +45,8 @@ use Bugzilla::User;
use Bugzilla::Product;
use Bugzilla::Field;
Bugzilla->request_cache->{user} = Bugzilla::User->super_user();
# Turn off output buffering (probably needed when displaying output feedback
# in the regenerate mode).
$| = 1;
@ -63,7 +65,6 @@ if (chdir($graphsdir)) {
my $dbh = Bugzilla->switch_to_shadow_db();
# To recreate the daily statistics, run "collectstats.pl --regenerate" .
my $regenerate = 0;
if ($#ARGV >= 0 && $ARGV[0] eq "--regenerate") {
@ -474,16 +475,16 @@ sub CollectSeriesData {
# <frequency> days, but the start date depends on the series_id.
my $days_since_epoch = int(time() / (60 * 60 * 24));
my $today = $ARGV[0];
if ($today !~ /^\d{4,}-\d{2}-\d{2}$/so)
if (!$today || $today !~ /^\d{4,}-\d{2}-\d{2}$/so)
{
$today = today_dash($today =~ /^(-?\d+)$/ ? $1 : 0);
$today = today_dash($today && $today =~ /^(-?\d+)$/ ? $1 : 0);
}
# We save a copy of the main $dbh and then switch to the shadow and get
# that one too. Remember, these may be the same.
my $dbh = Bugzilla->switch_to_main_db();
my $shadow_dbh = Bugzilla->switch_to_shadow_db();
my $serieses = $dbh->selectall_hashref("SELECT series_id, query, creator " .
"FROM series " .
"WHERE frequency != 0 AND " .
@ -497,10 +498,10 @@ sub CollectSeriesData {
# We delete from the table beforehand, to avoid SQL errors if people run
# collectstats.pl twice on the same day.
my $deletesth = $dbh->prepare("DELETE FROM series_data
my $deletesth = $dbh->prepare("DELETE FROM series_data
WHERE series_id = ? AND series_date = " .
$dbh->quote($today));
foreach my $series_id (keys %$serieses) {
# We set up the user for Search.pm's permission checking - each series
# runs with the permissions of its creator.

6
reports.cgi
View File

@ -210,7 +210,7 @@ sub generate_chart {
my $date = $line[0];
my ($yy, $mm, $dd) = $date =~ /^\d{2}(\d{2})(\d{2})(\d{2})$/;
push @{$data{DATE}}, "$mm/$dd/$yy";
for my $i (1 .. $#fields) {
my $field = $fields[$i];
if (! defined $line[$i] or $line[$i] eq '') {
@ -224,7 +224,7 @@ sub generate_chart {
}
}
}
shift @labels;
close FILE;
@ -256,7 +256,7 @@ sub generate_chart {
dataset4 => [0, 0, 0], # black
},
);
$img->set (%settings);
$img->$type($image_file, [ @data{('DATE', @labels)} ]);
}