diff options
| author | Byron Jones <glob@mozilla.com> | 2015-10-12 17:04:17 +0200 |
|---|---|---|
| committer | Byron Jones <glob@mozilla.com> | 2015-10-12 17:04:17 +0200 |
| commit | 07791e2b9be26347cd3e7bbb8a5f004211841908 (patch) | |
| tree | a7b757db4a598fdb15137a5b88cbed5d1b35643d | |
| parent | 81460eefa7297f014bc6a322bc71d19553d76abc (diff) | |
| download | bugzilla-07791e2b9be26347cd3e7bbb8a5f004211841908.tar.gz bugzilla-07791e2b9be26347cd3e7bbb8a5f004211841908.tar.xz | |
Bug 1211891 - needinfo requests where the current user is the requestee shouldn't be editable
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl | 3 | ||||
| -rw-r--r-- | extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl | 20 |
2 files changed, 13 insertions, 10 deletions
diff --git a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl index 2663d5562..eca6f5805 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -576,13 +576,12 @@ [%# needinfo %] [% WRAPPER bug_modal/field.html.tmpl container = 1 - label = "NeedInfo" + label = "NeedInfo From" hide_on_view = needinfo.size == 0 hide_on_edit = 1 %] [% INCLUDE bug_modal/flags.html.tmpl types = bug.flag_types.only("name", "needinfo") - no_label = 1 view_only = 1 %] [% END %] diff --git a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl index 0c0362902..3e0da1173 100644 --- a/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/flags.html.tmpl @@ -9,21 +9,25 @@ [%# # types: array of flag_type objects # no_label: if set to a true value, flag name and status will not be outputted (default: false) - # read_only: if true, don't output edit ui (default: false) + # view_only: if true, don't output edit ui (default: false) #%] -[% IF read_only %] +[% IF view_only %] <div class="flags edit-hide"> [% FOREACH type IN types %] [% FOREACH flag IN type.flags %] <div class="flag"> - [% UNLESS no_label %] - [% INCLUDE bug_modal/user.html.tmpl u=flag.setter nick_only=1 %] - [%+ flag.type.name FILTER html %][% flag.status FILTER none %] - [% END %] - [% IF flag.requestee %] - [%+ INCLUDE bug_modal/user.html.tmpl u=flag.requestee nick_only=1 %] + [% INCLUDE bug_modal/user.html.tmpl u=flag.requestee nick_only=1 %] + [% activity_id = bug.find_activity_id_for_flag(flag) %] + [% IF activity_id %] + <a href="#[% activity_id FILTER none %]" + [% ELSE %] + <span [% END %] + class="[% " activity-ref" IF activity_id %]" + > + [% INCLUDE bug_modal/rel_time.html.tmpl ts=flag.creation_date %] + [% activity_id ? "</a>" : "</span>" %] </div> [% END %] [% END %] |