summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-11-04 06:38:46 +0100
committerByron Jones <glob@mozilla.com>2014-11-04 06:38:46 +0100
commit7dc675fedb5b2631a8bafd0fb691eac485eff0af (patch)
tree548488280f00fc5e03ef841a2f997fa3fbb1ff73 /extensions
parent300d1ba13e050aa1e954dde640092c448184cbba (diff)
downloadbugzilla-7dc675fedb5b2631a8bafd0fb691eac485eff0af.tar.gz
bugzilla-7dc675fedb5b2631a8bafd0fb691eac485eff0af.tar.xz
Bug 1092037: backport bug 1062739 to bmo (add the ability for administrators to limit the number of emails sent to a user per minute and hour)
Diffstat (limited to 'extensions')
-rw-r--r--extensions/BMO/Extension.pm3
-rw-r--r--extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl2
2 files changed, 2 insertions, 3 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 5ada4eb72..9e900a381 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -169,8 +169,7 @@ sub page_before_template {
Bugzilla::Extension::BMO::Reports::Groups::members_report($vars);
}
elsif ($page eq 'email_queue.html') {
- require Bugzilla::Extension::BMO::Reports::EmailQueue;
- Bugzilla::Extension::BMO::Reports::EmailQueue::report($vars);
+ print Bugzilla->cgi->redirect('view_job_queue.cgi');
}
elsif ($page eq 'release_tracking_report.html') {
require Bugzilla::Extension::BMO::Reports::ReleaseTracking;
diff --git a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
index 93f04c4fa..fd48130eb 100644
--- a/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/reports/menu-end.html.tmpl
@@ -51,7 +51,7 @@
[% IF user.in_group('admin') || user.in_group('infra') %]
<li>
<strong>
- <a href="[% urlbase FILTER none %]page.cgi?id=email_queue.html">Email Queue</a>
+ <a href="[% urlbase FILTER none %]view_job_queue.cgi">Email Queue</a>
</strong> - TheSchwartz queue
</li>
[% END %]