aboutsummaryrefslogtreecommitdiffstats
path: root/template
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2012-11-26 20:20:29 +0100
committerFrédéric Buclin <LpSolit@gmail.com>2012-11-26 20:20:29 +0100
commit46e5d925026ccde28118bfcf28061c75f188b066 (patch)
treed9d95ff2e945ba67f1b8368cc33d24e38cd5dc6f /template
parentccf2d3e5e476ce72cb95894b68358950bfa1d24b (diff)
downloadbugs-46e5d925026ccde28118bfcf28061c75f188b066.tar
bugs-46e5d925026ccde28118bfcf28061c75f188b066.tar.gz
bugs-46e5d925026ccde28118bfcf28061c75f188b066.tar.bz2
bugs-46e5d925026ccde28118bfcf28061c75f188b066.tar.xz
bugs-46e5d925026ccde28118bfcf28061c75f188b066.zip
Bug 718289: The deadline field should be visible by non-members of the timetracking group
r=dkl a=LpSolit
Diffstat (limited to 'template')
-rw-r--r--template/en/default/bug/edit.html.tmpl9
-rw-r--r--template/en/default/bug/show-multiple.html.tmpl2
-rw-r--r--template/en/default/search/form.html.tmpl5
3 files changed, 10 insertions, 6 deletions
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