From 65fb443e8821cd6ae5ac82bdeae13fdf1bb19d8a Mon Sep 17 00:00:00 2001 From: "bzrmirror%bugzilla.org" Date: Wed, 19 Nov 2014 17:31:03 +0000 Subject: [PATCH] Bug 1097798: Do not display the resolution in the dependency tree for open bugs, nor the target milestone if usetargetmilestone is off r=dkl a=glob git-svn-id: svn://10.0.0.236/trunk@265677 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/webtools/bugzilla/.bzrrev | 2 +- mozilla/webtools/bugzilla/.gitrev | 2 +- .../template/en/default/bug/dependency-tree.html.tmpl | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index 5f71f473f9e..ec64699b791 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -9211 \ No newline at end of file +9212 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev index 200febc8905..88e8e55f292 100644 --- a/mozilla/webtools/bugzilla/.gitrev +++ b/mozilla/webtools/bugzilla/.gitrev @@ -1 +1 @@ -259615dd0912f238868a78be5ed5f9c73e588964 \ No newline at end of file +ca99361e17e2ebc0a5bbb017a5c9cb347c49caae \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl index 16299c121c6..a2730f3c91a 100644 --- a/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/bug/dependency-tree.html.tmpl @@ -152,9 +152,12 @@ [% END %] [% BLOCK buginfo %] - [% display_value("bug_status", bug.bug_status) FILTER html -%] [%+ display_value("resolution", bug.resolution) FILTER html %]; + [% display_value("bug_status", bug.bug_status) FILTER html -%] + [%- IF bug.resolution %] [%+ display_value("resolution", bug.resolution) FILTER html %][% END %]; [%-%] assigned to [% bug.assigned_to.login FILTER email FILTER html %] - [%-%][% "; Target: " _ bug.target_milestone IF bug.target_milestone %] + [% IF Param("usetargetmilestone") AND bug.target_milestone %] + [%-%]; target: [% bug.target_milestone FILTER html %] + [% END %] [% END %] [%###########################################################################%]