From 46e5d925026ccde28118bfcf28061c75f188b066 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Mon, 26 Nov 2012 20:20:29 +0100
Subject: Bug 718289: The deadline field should be visible by non-members of
 the timetracking group r=dkl a=LpSolit

---
 template/en/default/bug/edit.html.tmpl          | 9 ++++++---
 template/en/default/bug/show-multiple.html.tmpl | 2 ++
 template/en/default/search/form.html.tmpl       | 5 ++---
 3 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'template')

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index de9afb56c..0eefc1b48 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -65,8 +65,8 @@
           
           [% PROCESS section_spacer %]
           
-          [%# *** severity, priority, version and milestone *** %]
-          [% PROCESS section_details2 %]            
+          [%# *** severity, priority, version, milestone, and deadline *** %]
+          [% PROCESS section_details2 %]
           
           [%# *** assigned to and qa contact *** %]
           [% PROCESS section_people %]
@@ -355,7 +355,10 @@
         [% PROCESS select selname = "target_milestone" %]
       </tr>
     [% END %]
-  
+
+    [% IF Param("timetrackinggroup") && bug.deadline %]
+      [% INCLUDE bug/field.html.tmpl field = bug_fields.deadline, value = bug.deadline, editable = 0 %]
+    [% END %]
 [% END %]
 
 [%############################################################################%]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 7207e8cf9..a20daedfa 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -233,6 +233,8 @@
           </table>
         </td>
       </tr>
+    [% END %]
+    [% IF Param("timetrackinggroup") && bug.deadline %]
       [% PROCESS row cell="deadline" %]
     [% END %]
 
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index 48980b633..6ced46236 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -114,7 +114,7 @@ TUI_hide_default('information_query');
     [%+ field_descs.longdesc FILTER html %]s, [%+ field_descs.bug_file_loc FILTER html %], 
     [% IF Param('usestatuswhiteboard') %] [%+ field_descs.status_whiteboard FILTER html %], [%+ END %]
     [% IF use_keywords %] [%+ field_descs.keywords FILTER html %], [%+ END %]
-    [% IF user.is_timetracker %] [%+ field_descs.deadline FILTER html %], [%+ END %]
+    [% IF Param('timetrackinggroup') %] [%+ field_descs.deadline FILTER html %], [%+ END %]
     [% terms.Bug %] Numbers, [%+ field_descs.version FILTER html %], 
     [% IF Param('usetargetmilestone') %] [%+ field_descs.target_milestone FILTER html %], [%+ END %]
     [% field_descs.bug_severity FILTER html %], [%+ field_descs.priority FILTER html %], [%+ field_descs.rep_platform FILTER html %], 
@@ -153,8 +153,7 @@ TUI_hide_default('information_query');
     </div>
   [% END %]
 
-  [%# Deadline %]
-  [% IF user.is_timetracker %]
+  [% IF Param('timetrackinggroup') %]
     <div class="search_field_row">
         [% INCLUDE "search/field.html.tmpl" 
                     field = bug_fields.deadline 
-- 
cgit v1.2.3-24-g4f1b