From: Kohei Yoshino Date: Tue, 2 Apr 2019 19:28:30 +0000 (-0400) Subject: Bug 1539941 - Link keywords and flags in bug detail to searches (and later graphing) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd90e203d529184f62db9f155f433de060608724;p=thirdparty%2Fbugzilla.git Bug 1539941 - Link keywords and flags in bug detail to searches (and later graphing) --- diff --git a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl index 2d32d0652..fb2391c39 100644 --- a/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl @@ -353,6 +353,11 @@ [%+ ELSIF change.fieldname == 'reporter_accessible'; ""; + ELSIF change.fieldname.match('^cf_(status|tracking)_'); + %] + + [%~ field_descs.${change.fieldname} FILTER html %]: + [%+ ELSE; field_descs.${change.fieldname} _ ": " FILTER html; END; @@ -415,6 +420,14 @@ "Not accessible to reporter"; END; + CASE 'keywords'; + FOREACH keyword IN value.split(', '); + %] + + [%~ keyword FILTER html %][% ", " UNLESS loop.last %] + [%+ + END; + CASE; IF change.fieldtype == constants.FIELD_TYPE_DATETIME; INCLUDE bug_modal/rel_time.html.tmpl ts=value; @@ -422,6 +435,11 @@ ELSIF change.buglist; value FILTER bug_list_link; + ELSIF change.fieldname.match('^cf_(status|tracking)_') && value != '---'; + %] + [% value FILTER html %] + [%+ ELSE; value FILTER truncate(256, '…') FILTER html; 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 27c50f2a5..c218ab5e0 100644 --- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl @@ -893,7 +893,14 @@ hide_on_view = bug.keyword_objects.size == 0 help = basepath _ "describekeywords.cgi" %] - [% bug.keyword_objects.pluck("name").join(", ") || "---" FILTER html %] + [% IF bug.keyword_objects.size %] + [% FOREACH keyword IN bug.keyword_objects.pluck("name") %] + + [%~ keyword FILTER html %][% ", " UNLESS loop.last %] + [% END %] + [% ELSE %] + [% "---" FILTER html %] + [% END %] [% END %] [% UNLESS cf_hidden_in_product('cf_fx_iteration', bug.product, bug.component, bug) %] diff --git a/extensions/BugModal/template/en/default/bug_modal/tracking_flags.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/tracking_flags.html.tmpl index d6f7d6f89..13766be09 100644 --- a/extensions/BugModal/template/en/default/bug_modal/tracking_flags.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/tracking_flags.html.tmpl @@ -43,9 +43,23 @@ [% row.name FILTER html %] [% IF type == "tracking" %] - [% tracking_value FILTER html %] + + [% IF tracking_value != '---' %] + + [% END %] + [%~ tracking_value FILTER html ~%] + [% '' IF tracking_value != '---' %] + [% END %] - [% status_value FILTER html %] + + [% IF status_value != '---' %] + + [% END %] + [%~ status_value FILTER html ~%] + [% '' IF status_value != '---' %] + [% END %]