summaryrefslogtreecommitdiffstats
path: root/extensions/BugModal
diff options
context:
space:
mode:
authorDylan William Hardison <dylan@hardison.net>2018-08-26 07:55:24 +0200
committerDylan William Hardison <dylan@hardison.net>2018-08-26 07:55:24 +0200
commit9263f397e701f25af395e8cdee48c87ee3327157 (patch)
treecc7f6b6beef8947090a108701ca34316a5c8edb8 /extensions/BugModal
parent23b94e8410d90e9e15584d3a9220b6bb214f4220 (diff)
parentd57aefa118802606ea7cc424aaa62173be9eec41 (diff)
downloadbugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.gz
bugzilla-9263f397e701f25af395e8cdee48c87ee3327157.tar.xz
Merge remote-tracking branch 'bmo/mojo'
Diffstat (limited to 'extensions/BugModal')
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/activity_stream.html.tmpl1
-rw-r--r--extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl9
2 files changed, 8 insertions, 2 deletions
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 36494773b..08c6b5b64 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
@@ -222,6 +222,7 @@
[% IF extra_class %]
<span class="user-role">([% extra_class.ucfirst FILTER none %])</span>
[% END %]
+ [% Hook.process('user', 'bug/changes.html.tmpl') %]
</td>
<td class="comment-actions">
<button type="button" class="change-spinner minor" id="as-[% id FILTER none %]">-</button>
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 5d38d8340..bcbea3f15 100644
--- a/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
+++ b/extensions/BugModal/template/en/default/bug_modal/edit.html.tmpl
@@ -391,7 +391,9 @@
<li role="separator"></li>
<div class="actions">
<div><a href="buglist.cgi?product=[% bug.product FILTER uri %]&amp;bug_status=__open__"
- target="_blank" role="menuitem" tabindex="-1">See Other [% terms.Bugs %]</a></div>
+ target="_blank" role="menuitem" tabindex="-1">See All [% terms.Bugs %] in This Product</a></div>
+ <div><a href="enter_bug.cgi?product=[% bug.product FILTER uri %]"
+ target="_blank" role="menuitem" tabindex="-1">File New [% terms.Bug %] in This Product</a></div>
<div><button disabled type="button" class="minor component-watching" role="menuitem" tabindex="-1"
data-product="[% bug.product FILTER html %]"
data-label-watch="Watch This Product" data-label-unwatch="Unwatch This Product"
@@ -447,7 +449,10 @@
<div class="actions">
<div><a href="buglist.cgi?product=[% bug.product FILTER uri %]&amp;
[%~ %]component=[% bug.component FILTER uri %]&amp;bug_status=__open__"
- target="_blank" role="menuitem" tabindex="-1">See Other [% terms.Bugs %]</a></div>
+ target="_blank" role="menuitem" tabindex="-1">See All [% terms.Bugs %] in This Component</a></div>
+ <div><a href="enter_bug.cgi?product=[% bug.product FILTER uri %]&amp;
+ [%~ %]component=[% bug.component FILTER uri %]"
+ target="_blank" role="menuitem" tabindex="-1">File New [% terms.Bug %] in This Component</a></div>
<div><button disabled type="button" class="minor component-watching" role="menuitem" tabindex="-1"
data-product="[% bug.product FILTER html %]" data-component="[% bug.component FILTER html %]"
data-label-watch="Watch This Component" data-label-unwatch="Unwatch This Component"