Attachment 313772 Details for Bug 457676 – v1 adding alias to dependencies in show_bug.cgi

[patch] v1 adding alias to dependencies in show_bug.cgi

deps_aliases.patch (text/plain), 3.67 KB, created by Noura El hawary on 2008-08-08 02:25:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noura El hawary

Created: 2008-08-08 02:25:09 UTC

Size: 3.67 KB

patch

obsolete

>Index: Bugzilla/Template.pm
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/Bugzilla/Template.pm,v
>retrieving revision 1.10
>diff -p -u -r1.10 Template.pm
>--- Bugzilla/Template.pm	1 Jul 2008 21:04:25 -0000	1.10
>+++ Bugzilla/Template.pm	8 Aug 2008 02:21:09 -0000
>@@ -314,9 +314,10 @@ sub get_attachment_link {
> #  - The link text, to place between the <a>..</a>
> #  - An optional comment number, for linking to a particular
> #    comment in the bug
>-
>+# REDHAT EXTENSION 457676 
>+# added use_alias param and all alias occurance in the subroutine
> sub get_bug_link {
>-    my ($bug_num, $link_text, $comment_num) = @_;
>+    my ($bug_num, $link_text, $comment_num, $use_alias) = @_;
>     my $dbh = Bugzilla->dbh;
> 
>     if (!defined($bug_num) || ($bug_num eq "")) {
>@@ -325,11 +326,15 @@ sub get_bug_link {
>     my $quote_bug_num = html_quote($bug_num);
>     detaint_natural($bug_num) || return "&lt;invalid bug number: $quote_bug_num&gt;";
> 
>-    my ($bug_state, $bug_res, $bug_desc) =
>-        $dbh->selectrow_array('SELECT bugs.bug_status, resolution, short_desc
>+    my ($bug_state, $bug_res, $bug_desc, $alias) =
>+        $dbh->selectrow_array('SELECT bugs.bug_status, resolution, short_desc, alias
>                                FROM bugs WHERE bugs.bug_id = ?',
>                                undef, $bug_num);
> 
>+    if ($use_alias) {
>+        $link_text = $alias;
>+    }
>+
>     if ($bug_state) {
>         # Initialize these variables to be "" so that we don't get warnings
>         # if we don't change them below (which is highly likely).
>@@ -556,11 +561,13 @@ sub create {
>                            1
>                          ],
> 
>+            # REDHAT EXTENSION START 457676
>+            # added alias paran to subroutine
>             bug_link => [ sub {
>-                              my ($context, $bug) = @_;
>+                              my ($context, $bug, $use_alias) = @_;
>                               return sub {
>                                   my $text = shift;
>-                                  return get_bug_link($bug, $text);
>+                                  return get_bug_link($bug, $text, undef ,$use_alias);
>                               };
>                           },
>                           1
>Index: template/en/default/bug/edit.html.tmpl
>===================================================================
>RCS file: /cvs/qa/rh_bugzilla_3/template/en/default/bug/edit.html.tmpl,v
>retrieving revision 1.40
>diff -p -u -r1.40 edit.html.tmpl
>--- template/en/default/bug/edit.html.tmpl	5 Aug 2008 17:34:34 -0000	1.40
>+++ template/en/default/bug/edit.html.tmpl	8 Aug 2008 02:21:21 -0000
>@@ -1116,6 +1116,7 @@
> 
> [% BLOCK dependencies %]
> 
>+  [% use_alias = 1 %]
>   <th class="field_label">
>     <label for="[% dep.fieldname %]"[% " accesskey=\"$accesskey\"" IF accesskey %]>
>     [% dep.title %]</label>:
>@@ -1127,10 +1128,24 @@
>                value="[% bug.${dep.fieldname}.join(', ') %]">
>       [% END %]
>     </span>
>-    
>+
>+    [%# REDHAT EXTENSION START 457676 %] 
>+    [% deps = bug.${dep.fieldname}.join(', ') %]
>+    [% IF deps %]
>+      <b>
>+        [% "(" %]
>+        [% FOREACH depbug = bug.${dep.fieldname} %]
>+          [% depbug FILTER bug_link(depbug, use_alias) FILTER none %][% " " %]
>+        [% END %]
>+        [% ")" %]
>+        </b>
>+    [% END %]
>+    [%# REDHAT EXTENSION END 457676 %]
>+
>     [% FOREACH depbug = bug.${dep.fieldname} %]
>       [% depbug FILTER bug_link(depbug) FILTER none %][% " " %]
>     [% END %]
>+    
>     [% IF bug.check_can_change_field(dep.fieldname, 0, 1) %]
>       <span id="[% dep.fieldname %]_edit_container" class="edit_me bz_default_hidden" >
>         (<a href="#" id="[% dep.fieldname %]_edit_action">edit</a>)

Flags:

dkl: review-

Actions: View | Diff

Attachments on bug 457676: 313772 | 313782