From: Frédéric Buclin <LpSolit@gmail.com>
Date: Wed, 19 Nov 2014 17:26:34 +0000 (+0100)
Subject: Bug 1097798: Do not display the resolution in the dependency tree for open bugs,... 
X-Git-Tag: bugzilla-4.2.12~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa048833d6968c6f311c5ccaa034f5f40237860c;p=thirdparty%2Fbugzilla.git

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
---

diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl
index 17f00803f3..e5d3536570 100644
--- a/template/en/default/bug/dependency-tree.html.tmpl
+++ b/template/en/default/bug/dependency-tree.html.tmpl
@@ -169,9 +169,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 %]
 
 [%###########################################################################%]