From 2f804027b44c5790d4547f3161bff28266150bef Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Tue, 10 Nov 2009 16:31:47 +0000
Subject: Bug 505039: Use $user->is_timetracker instead of
 $user->in_group(Bugzilla->params->{'timetrackinggroup'}) - Patch by XqueZme
 <xquezme@gmail.com> r/a=LpSolit

---
 template/en/default/bug/comments.html.tmpl       | 2 +-
 template/en/default/bug/create/create.html.tmpl  | 4 ++--
 template/en/default/bug/edit.html.tmpl           | 4 ++--
 template/en/default/bug/show-multiple.html.tmpl  | 2 +-
 template/en/default/bug/show.xml.tmpl            | 2 +-
 template/en/default/list/edit-multiple.html.tmpl | 2 +-
 template/en/default/list/list.html.tmpl          | 2 +-
 template/en/default/search/form.html.tmpl        | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'template/en')

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 41436f9b2..9a04b7147 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -205,7 +205,7 @@
         </span>
       </div>
 
-      [% IF user.in_group(Param('timetrackinggroup')) &&
+      [% IF user.is_timetracker &&
             (comment.work_time > 0 || comment.work_time < 0) %]
          <br>
          Additional hours worked: 
diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl
index 1d3160563..3572ec372 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -345,7 +345,7 @@ TUI_hide_default('expert_fields');
     <td>&nbsp;</td>
     [%# Calculate the number of rows we can use for flags %]
     [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
-                      (user.in_group(Param('timetrackinggroup')) ? 3 : 0) +
+                      (user.is_timetracker ? 3 : 0) +
                       (Param("usebugaliases") ? 1 : 0)
     %]
 
@@ -427,7 +427,7 @@ TUI_hide_default('expert_fields');
     <td colspan="3">&nbsp;</td>
   </tr>
 
-[% IF user.in_group(Param('timetrackinggroup')) %]
+[% IF user.is_timetracker %]
   <tr>
     <th>Estimated Hours:</th>
     <td colspan="2">
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 853ad7287..813e80cb2 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -115,7 +115,7 @@
       return text;
   }
 
-[% IF user.in_group(Param('timetrackinggroup')) %]
+[% IF user.is_timetracker %]
   var fRemainingTime = [% bug.remaining_time %]; // holds the original value
   function adjustRemainingTime() {
       // subtracts time spent from remaining time
@@ -213,7 +213,7 @@
 
   
   [% PROCESS section_restrict_visibility %]
-  [% IF user.in_group(Param('timetrackinggroup')) %]
+  [% IF user.is_timetracker %]
     <br>
     [% PROCESS section_timetracking %]
   [% END %]
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 903d9d622..b6507b964 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -195,7 +195,7 @@
       [% PROCESS dependencies name = "blocked"  %]
     [% END %]
 
-    [% IF user.in_group(Param("timetrackinggroup")) %]
+    [% IF user.is_timetracker %]
       <tr>
         <th>Time tracking:</th>
         <td colspan="3">
diff --git a/template/en/default/bug/show.xml.tmpl b/template/en/default/bug/show.xml.tmpl
index f4ad0ceda..31e56d299 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -71,7 +71,7 @@
             <commentid>[% c.id FILTER xml %]</commentid>
             <who name="[% c.author.name FILTER xml %]">[% c.author.email FILTER email FILTER xml %]</who>
             <bug_when>[% c.creation_ts FILTER time("%Y-%m-%d %T %z") FILTER xml %]</bug_when>
-            [% IF user.in_group(Param('timetrackinggroup')) && (c.work_time - 0 != 0) %]
+            [% IF user.is_timetracker && (c.work_time - 0 != 0) %]
               <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
             [% END %]
             <thetext>[% c.body_full FILTER xml %]</thetext>
diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 05d534976..528d1bd68 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -140,7 +140,7 @@
     <th><label for="bug_status">Status:</label></th>
     <td colspan="3">[% PROCESS status_section %]</td>
   </tr>
-  [% IF user.in_group(Param("timetrackinggroup")) %]
+  [% IF user.is_timetracker %]
     <tr>
       <th><label for="estimated_time">Estimated Hours:</label></th>
       <td>
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index a3e3a767a..6d7f80585 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -198,7 +198,7 @@
             <input type="submit" value="XML" id="xml">
         </form>
 
-        [% IF user.in_group(Param('timetrackinggroup')) %]
+        [% IF user.is_timetracker %]
           <form method="post" action="summarize_time.cgi">
             <input type="hidden" name="id" value="[% buglist_joined FILTER html %]">
             <input type="submit" id="timesummary" value="Time Summary">
diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl
index a237fd347..c52f5dcc5 100644
--- a/template/en/default/search/form.html.tmpl
+++ b/template/en/default/search/form.html.tmpl
@@ -305,7 +305,7 @@ function doOnSelectProduct(selectmode) {
   [% END %]
 
   [%# Deadline %]
-  [% IF user.in_group(Param("timetrackinggroup")) %]
+  [% IF user.is_timetracker %]
     <tr>
       <th align="right">
         <label for="deadlinefrom" accesskey="l">Dead<u>l</u>ine</label>:
-- 
cgit v1.2.3-24-g4f1b