From 832be61ce419f06cc682e7afc07d9197592a6bf5 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org" <>
Date: Wed, 30 Sep 2009 22:34:31 +0000
Subject: Bug 512623: Change get_status and get_resolution to display_value
 everywhere. Patch by Max Kanat-Alexander <mkanat@bugzilla.org> r=LpSolit,
 a=LpSolit

---
 template/en/default/list/edit-multiple.html.tmpl | 4 ++--
 template/en/default/list/list.csv.tmpl           | 4 ++--
 template/en/default/list/list.html.tmpl          | 4 ++--
 template/en/default/list/table.html.tmpl         | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'template/en/default/list')

diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl
index 4cbc8b6e2..fa8d3d1ae 100644
--- a/template/en/default/list/edit-multiple.html.tmpl
+++ b/template/en/default/list/edit-multiple.html.tmpl
@@ -384,7 +384,7 @@
   
     [% FOREACH bug_status = new_bug_statuses %]
       <option value="[% bug_status.name FILTER html %]">
-        [% get_status(bug_status.name) FILTER html %]
+        [% display_value("bug_status", bug_status.name) FILTER html %]
       </option>
       [% IF !bug_status.is_open %]
         [% filtered_status =  bug_status.name FILTER js %]
@@ -405,7 +405,7 @@
     [% FOREACH r = resolutions %]
       [% NEXT IF !r %]
       [% NEXT IF r == "DUPLICATE" || r == "MOVED" %]
-      <option value="[% r FILTER html %]">[% get_resolution(r) FILTER html %]</option>
+      <option value="[% r FILTER html %]">[% display_value("resolution", r) FILTER html %]</option>
     [% END %]
   </select>
   </span>
diff --git a/template/en/default/list/list.csv.tmpl b/template/en/default/list/list.csv.tmpl
index 1a25b3907..6114d6fae 100644
--- a/template/en/default/list/list.csv.tmpl
+++ b/template/en/default/list/list.csv.tmpl
@@ -36,9 +36,9 @@ bug_id
         [% rawcolumn = column.replace("date", "time") %]
         [% bug.$column = bug.$rawcolumn FILTER time("%Y-%m-%d %H:%M:%S") %]
       [% ELSIF column == 'bug_status' %]
-        [% bug.$column = get_status(bug.$column) %]
+        [% bug.$column = display_value("bug_status", bug.$column) %]
       [% ELSIF column == 'resolution' %]
-        [%- bug.$column = get_resolution(bug.$column) %]
+        [%- bug.$column = display_value("resolution", bug.$column) %]
       [% END %]
       [% bug.$column FILTER csv %]
     [% END %]
diff --git a/template/en/default/list/list.html.tmpl b/template/en/default/list/list.html.tmpl
index c723e3f95..7c372f1f4 100644
--- a/template/en/default/list/list.html.tmpl
+++ b/template/en/default/list/list.html.tmpl
@@ -93,11 +93,11 @@
     [% END %]
     [% IF desc_item.field == 'bug_status' %]
       [% FOREACH status IN desc_item.value.split(',') %]
-        [%+ get_status(status) FILTER html %][% ',' UNLESS loop.last %]
+        [%+ display_value("bug_status", status) FILTER html %][% ',' UNLESS loop.last %]
       [% END %]
     [% ELSIF desc_item.field == 'resolution' %]
       [% FOREACH resolution IN desc_item.value.split(',') %]
-        [%+ get_resolution(resolution) FILTER html %][% ',' UNLESS loop.last %]
+        [%+ display_value("resolution", resolution) FILTER html %][% ',' UNLESS loop.last %]
       [% END %]
     [% ELSE %]
       [%+ desc_item.value FILTER html %]
diff --git a/template/en/default/list/table.html.tmpl b/template/en/default/list/table.html.tmpl
index 87833ff5b..2305d2fa5 100644
--- a/template/en/default/list/table.html.tmpl
+++ b/template/en/default/list/table.html.tmpl
@@ -199,9 +199,9 @@
       [% IF abbrev.$column.maxlength %]
         <span title="
           [%- IF column == 'bug_status' %]
-            [%- get_status(bug.$column) FILTER html %]
+            [%- display_value("bug_status", bug.$column) FILTER html %]
           [% ELSIF column == 'resolution' %]
-            [%- get_resolution(bug.$column) FILTER html %]
+            [%- display_value("resolution", bug.$column) FILTER html %]
           [% ELSE %]
             [%- bug.$column FILTER html %]
           [% END %]">
@@ -213,9 +213,9 @@
                column == 'estimated_time' %]
         [% PROCESS formattimeunit time_unit=bug.$column %] 
       [% ELSIF column == 'bug_status' %]
-        [%- get_status(bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %]
+        [%- display_value("bug_status", bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %]
       [% ELSIF column == 'resolution' %]
-        [%- get_resolution(bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %]
+        [%- display_value("resolution", bug.$column).truncate(abbrev.$column.maxlength, abbrev.$column.ellipsis) FILTER html %]
 
       [%# Display the login name of the user if their real name is empty. %]
       [% ELSIF column.match('_realname$') && bug.$column == '' %]
-- 
cgit v1.2.3-24-g4f1b