Bug 283582: Remove UserInGroup in favor of Bugzilla->user->in_group

Patch By victory(_RSZ_) <bmo2007@rsz.jp> r=mkanat, a=myk

5 files changed, 14 insertions, 14 deletions

diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 55a84819f..a4671d89d 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -38,7 +38,7 @@
 
 
 [% DEFAULT start_at = 0 mode = "show" %]
-[% isinsider = Param("insidergroup") && UserInGroup(Param("insidergroup")) %]
+[% isinsider = Param("insidergroup") && user.in_group(Param("insidergroup")) %]
 [% sort_order = user.settings.comment_sort_order.value %]
 
 [%# NOTE: (start_at > 0) means we came here from a midair collision,
@@ -134,7 +134,7 @@
           <label for="isprivate-[% count %]">Private</label>
         </i>
       [% END %]
-      [% IF UserInGroup(Param('timetrackinggroup')) &&
+      [% IF user.in_group(Param('timetrackinggroup')) &&
             (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 33e8b8090..26e95523b 100644
--- a/template/en/default/bug/create/create.html.tmpl
+++ b/template/en/default/bug/create/create.html.tmpl
@@ -258,7 +258,7 @@ function handleWantsAttachment(wants_attachment) {
     <td>&nbsp;</td>
     [%# Calculate the number of rows we can use for flags %]
     [% num_rows = 6 + (Param("useqacontact") ? 1 : 0) +
-                      (UserInGroup(Param('timetrackinggroup')) ? 3 : 0) +
+                      (user.in_group(Param('timetrackinggroup')) ? 3 : 0) +
                       (Param("usebugaliases") ? 1 : 0)
     %]
     <td rowspan="[% num_rows FILTER html %]" valign="top">
@@ -323,7 +323,7 @@ function handleWantsAttachment(wants_attachment) {
     <td colspan="2"></td>
   </tr>
 
-[% IF UserInGroup(Param('timetrackinggroup')) %]
+[% IF user.in_group(Param('timetrackinggroup')) %]
   <tr>
     <td align="right"><strong>Estimated Hours:</strong></td>
     <td colspan="2">
@@ -400,7 +400,7 @@ function handleWantsAttachment(wants_attachment) {
     </td>
   </tr>
 
-  [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %]
+  [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %]
     <tr>
       <td></td>
       <td colspan="3">
@@ -450,7 +450,7 @@ function handleWantsAttachment(wants_attachment) {
     </td>
   </tr>
 
-  [% IF UserInGroup('editbugs') %]
+  [% IF user.in_group('editbugs') %]
     [% IF use_keywords %]
       <tr>
         <td align="right" valign="top">
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 4cadc2114..c93d08c2b 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -57,7 +57,7 @@
 
       replytext = "(In reply to comment #" + id + ")\n" + replytext + "\n";
 
-    [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %]
+    [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %]
       if (document.getElementById('isprivate-'+id).checked) {
           document.getElementById('newcommentprivacy').checked = 'checked';
       }
@@ -97,7 +97,7 @@
       return text;
   }
 
-[% IF UserInGroup(Param('timetrackinggroup')) %]
+[% IF user.in_group(Param('timetrackinggroup')) %]
   var fRemainingTime = [% bug.remaining_time %]; // holds the original value
   function adjustRemainingTime() {
       // subtracts time spent from remaining time
@@ -435,7 +435,7 @@
     </tr>
   </table>
 
-  [% IF UserInGroup(Param('timetrackinggroup')) %]
+  [% IF user.in_group(Param('timetrackinggroup')) %]
     <br>
     <table cellspacing="0" cellpadding="4" border="1">
       <tr>
@@ -561,7 +561,7 @@
 
   <br>
   <label for="comment" accesskey="c"><b>Additional <u>C</u>omments</b></label>:
-  [% IF Param("insidergroup") && UserInGroup(Param("insidergroup")) %]
+  [% IF Param("insidergroup") && user.in_group(Param("insidergroup")) %]
     <input type="checkbox" name="commentprivacy" value="1"
            id="newcommentprivacy"
            onClick="updateCommentTagControl(this, form)">
diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl
index 35df0abb1..2ebb3a21a 100644
--- a/template/en/default/bug/show-multiple.html.tmpl
+++ b/template/en/default/bug/show-multiple.html.tmpl
@@ -183,7 +183,7 @@
       [% PROCESS dependencies name = "blocked"  %]
     [% END %]
 
-    [% IF UserInGroup(Param("timetrackinggroup")) %]
+    [% IF user.in_group(Param("timetrackinggroup")) %]
       <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 a941ebc62..a54202675 100644
--- a/template/en/default/bug/show.xml.tmpl
+++ b/template/en/default/bug/show.xml.tmpl
@@ -67,11 +67,11 @@
       [% END %]
       [% IF displayfields.long_desc %]
         [% FOREACH c = bug.longdescs %]
-          [% NEXT IF c.isprivate && !UserInGroup(Param("insidergroup")) %]
+          [% NEXT IF c.isprivate && !user.in_group(Param("insidergroup")) %]
           <long_desc isprivate="[% c.isprivate FILTER xml %]">
             <who>[% c.email FILTER xml %]</who>
             <bug_when>[% c.time FILTER time FILTER xml %]</bug_when>
-            [% IF UserInGroup(Param('timetrackinggroup')) && (c.work_time - 0 != 0) %]
+            [% IF user.in_group(Param('timetrackinggroup')) && (c.work_time - 0 != 0) %]
               <work_time>[% PROCESS formattimeunit time_unit = c.work_time FILTER xml %]</work_time>
             [% END %]
             <thetext>[% c.body FILTER xml %]</thetext>
@@ -81,7 +81,7 @@
       
       [% IF displayfields.attachment %]
         [% FOREACH a = bug.attachments %]
-          [% NEXT IF a.isprivate && !UserInGroup(Param("insidergroup")) %]
+          [% NEXT IF a.isprivate && !user.in_group(Param("insidergroup")) %]
           <attachment
               isobsolete="[% a.isobsolete FILTER xml %]"
               ispatch="[% a.ispatch FILTER xml %]"