Attachment 294892 Details for Bug 406371 – Patch to add additional columns in query resultsgroups

[patch] Patch to add additional columns in query resultsgroups

db_function_methods.patch (text/plain), 7.21 KB, created by David Lawrence on 2008-02-14 05:02:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Lawrence

Created: 2008-02-14 05:02:57 UTC

Size: 7.21 KB

patch

obsolete

>Index: buglist.cgi
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/buglist.cgi,v
>retrieving revision 1.5
>diff -u -r1.5 buglist.cgi
>--- buglist.cgi	13 Feb 2008 16:44:32 -0000	1.5
>+++ buglist.cgi	14 Feb 2008 04:39:02 -0000
>@@ -677,6 +677,13 @@
>     "END) AS percentage_complete"                               , "% Complete"); 
> DefineColumn("relevance"         , "relevance"                  , "Relevance"        );
> DefineColumn("deadline"          , $dbh->sql_date_format('bugs.deadline', '%Y-%m-%d') . " AS deadline", "Deadline");
>+# REDHAT EXTENSION START 406371
>+DefineColumn("issuetrackers"     , $dbh->sql_issue_tracker_list() . " AS issuetrackers", "Issue Trackers");
>+DefineColumn("dependson"         , $dbh->sql_dependson_list() . " AS dependson", "Depends On");
>+DefineColumn("blockedby"         , $dbh->sql_blockedby_list() . " AS blockedby", "Blocked By");
>+DefineColumn("itmaxscore"        , $dbh->sql_it_max_score() . " AS itmaxscore", "IT Max Score");
>+DefineColumn("flags"             , $dbh->sql_flag_list(values(%{Bugzilla->user->groups})) . " AS flags", "Flags" );
>+# REDHAT EXTENSION END 406371
> 
> foreach my $field (Bugzilla->get_fields({ custom => 1, obsolete => 0})) {
>     DefineColumn($field->name, 'bugs.' . $field->name, $field->description);
>Index: colchange.cgi
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/colchange.cgi,v
>retrieving revision 1.2
>diff -u -r1.2 colchange.cgi
>--- colchange.cgi	13 Feb 2008 16:44:32 -0000	1.2
>+++ colchange.cgi	14 Feb 2008 04:39:02 -0000
>@@ -58,6 +58,10 @@
> if (Bugzilla->params->{"usevotes"}) {
>     push (@masterlist, "votes");
> }
>+# REDHAT EXTENSION START 406371
>+push(@masterlist, ("dependson", "blockedby", "flags"));
>+# REDHAT EXTENSION END 406371
>+
> if (Bugzilla->params->{"usebugaliases"}) {
>     unshift(@masterlist, "alias");
> }
>@@ -90,7 +94,15 @@
>     push(@masterlist, ("estimated_time", "remaining_time", "actual_time",
>                        "percentage_complete", "deadline")); 
> }
>-
>+# REDHAT EXTENSION START 406371
>+if (Bugzilla->user->in_group('rhn')) {
>+    push(@masterlist, "cust_facing");
>+}
>+if (Bugzilla->params->{"useissuetracker"} && Bugzilla->user->in_group('issuetracker')) {
>+    push(@masterlist, "issuetrackers");
>+    push(@masterlist, "itmaxscore");
>+}
>+# REDHAT EXTENSION END 406371
> push(@masterlist, ("short_desc", "short_short_desc"));
> 
> my @custom_fields = grep { $_->type != FIELD_TYPE_MULTI_SELECT }
>Index: Bugzilla/DB/Mysql.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/DB/Mysql.pm,v
>retrieving revision 1.3
>diff -u -r1.3 Mysql.pm
>--- Bugzilla/DB/Mysql.pm	28 Jan 2008 04:46:17 -0000	1.3
>+++ Bugzilla/DB/Mysql.pm	14 Feb 2008 04:39:03 -0000
>@@ -205,6 +205,33 @@
>     return $self->_bz_build_schema_from_disk();
> }
> 
>+# REDHAT EXTENSION START 406371
>+sub sql_issue_tracker_list {
>+    my ($self) = @_;
>+    return "IssueTrackerList(bugs.bug_id)";
>+}
>+
>+sub sql_it_max_score {
>+    my ($self) = @_;
>+    return "(SELECT max(it_score) FROM bz_it_map WHERE bz_id = bugs.bug_id)";
>+}
>+
>+sub sql_flag_list {
>+    my ($self, @group_ids) = @_;
>+    return "FLagList(bugs.bug_id,'" . join(',', @group_ids). "')";
>+}
>+
>+sub sql_dependson_list {
>+    my ($self) = @_;
>+    return "DependsOnList(bugs.bug_id)";
>+}
>+
>+sub sql_blockedby_list {
>+    my ($self) = @_;
>+    return "BlockedByList(bugs.bug_id)";
>+}
>+# REDHAT EXTENSION END 406371
>+
> #####################################################################
> # Database Setup
> #####################################################################
>Index: Bugzilla/DB/Pg.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/DB/Pg.pm,v
>retrieving revision 1.3
>diff -u -r1.3 Pg.pm
>--- Bugzilla/DB/Pg.pm	19 Dec 2007 16:20:04 -0000	1.3
>+++ Bugzilla/DB/Pg.pm	14 Feb 2008 04:39:03 -0000
>@@ -167,6 +167,40 @@
>     return $exists || 0;
> }
> 
>+# REDHAT EXTENSION START 406371
>+sub sql_issue_tracker_list {
>+    my ($self) = @_;
>+    return "ARRAY(SELECT it_id FROM bz_it_map WHERE bz_id = bugs.bug_id AND it_id IS NOT NULL)";
>+}
>+
>+sub sql_it_max_score {
>+    my ($self) = @_;
>+    return "(SELECT max(it_score) FROM bz_it_map WHERE bz_id = bugs.bug_id)";
>+}
>+
>+sub sql_flag_list {
>+    my ($self, @group_ids) = @_;
>+    my $flag_select = "ARRAY(SELECT flagtypes.name || flags.status FROM flags 
>+                       LEFT JOIN flagtypes ON flags.type_id = flagtypes.id 
>+                       WHERE flags.is_active = 1 AND (flagtypes.view_group_id IS NULL";
>+    if ( @group_ids ) {
>+        $flag_select .= " OR flagtypes.view_group_id IN (" . join(',', @group_ids) . ")";
>+    }
>+    $flag_select .= ") AND flags.bug_id = bugs.bug_id)";
>+    return $flag_select;
>+}
>+
>+sub sql_dependson_list {
>+    my ($self) = @_;
>+    return "ARRAY(SELECT dependson FROM dependencies WHERE blocked = bugs.bug_id)";
>+}
>+
>+sub sql_blockedby_list {
>+    my ($self) = @_;
>+    return "ARRAY(SELECT blocked FROM dependencies WHERE dependson = bugs.bug_id)";
>+}
>+# REDHAT EXTENSION END 406371
>+
> #####################################################################
> # Custom Database Setup
> #####################################################################
>Index: template/en/default/global/field-descs.none.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/global/field-descs.none.tmpl,v
>retrieving revision 1.2
>diff -u -r1.2 field-descs.none.tmpl
>--- template/en/default/global/field-descs.none.tmpl	13 Feb 2008 16:44:32 -0000	1.2
>+++ template/en/default/global/field-descs.none.tmpl	14 Feb 2008 04:39:04 -0000
>@@ -22,8 +22,9 @@
> 
> [% PROCESS global/variables.none.tmpl %]
> 
>-[%# REDHAT EXTENSION START 406151
>-  # Added devel_whiteboard, qa_whiteboard, internal_whiteboard and fixed_in %]
>+[%# REDHAT EXTENSION START 406151 406371
>+  # Added devel_whiteboard, qa_whiteboard, internal_whiteboard, fixed_in 
>+  # issuetrackers, itmaxscore, blockedby, dependson, and flags %]
> [% field_descs = { "[Bug creation]"       => "[$terms.Bug creation]",
>                    "actual_time"          => "Actual Hours"
>                    "alias"                => "Alias",
>@@ -66,13 +67,18 @@
>                    "status_whiteboard"    => "Status Whiteboard",
>                    "devel_whiteboard"     => "Devel Whiteboard",
>                    "qa_whiteboard"        => "QA Whiteboard",
>+                   "issuetrackers"        => "Issue Trackers",
>+                   "itmaxscore"           => "IT Max Score",
>+                   "dependson"            => "Depends On",
>+                   "blockedby"            => "Blocked By",
>+                   "flags"                => "Flags",
>                    "internal_whiteboard"  => "Internal Whiteboard",
>                    "fixed_in"             => "Fixed In",
>                    "target_milestone"     => "Target Milestone",
>                    "version"              => "Version",
>                    "votes"                => "Votes",
>                    "work_time"            => "Hours Worked"} %]
>-[%# REDHAT EXTENSION END 406151 %]
>+[%# REDHAT EXTENSION END 406151 406371 %]
> 
> [%# Also include any custom fields or fields which don't have a
>     Description here, by copying their Description from the

Actions: View | Diff

Attachments on bug 406371: 294729 | 294756 | 294892