summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2015-04-28 14:56:35 +0200
committerByron Jones <glob@mozilla.com>2015-04-28 14:56:35 +0200
commit7bb734005d8b1ea66ae7c9cafae07b5b81a202e4 (patch)
tree869a9114c2251e634221343282c696aed7dc8b6c
parent2d50ce5613761739d6548b3145db9c963c52f59d (diff)
downloadbugzilla-7bb734005d8b1ea66ae7c9cafae07b5b81a202e4.tar.gz
bugzilla-7bb734005d8b1ea66ae7c9cafae07b5b81a202e4.tar.xz
Bug 1159166: When I ask for review from someone who is not accepting reviews, my red request count in the top left becomes their request count
-rw-r--r--extensions/Needinfo/Extension.pm2
-rw-r--r--extensions/Needinfo/template/en/default/hook/global/user-error-errors.html.tmpl2
-rw-r--r--extensions/Review/Extension.pm2
-rw-r--r--extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl2
4 files changed, 4 insertions, 4 deletions
diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm
index 0f3451e44..7d94fb9a4 100644
--- a/extensions/Needinfo/Extension.pm
+++ b/extensions/Needinfo/Extension.pm
@@ -187,7 +187,7 @@ sub _check_requestee {
? $requestee
: Bugzilla::User->new({ name => $requestee, cache => 1 });
if ($user->needinfo_blocked) {
- ThrowUserError('needinfo_blocked', { user => $user });
+ ThrowUserError('needinfo_blocked', { requestee => $user });
}
}
diff --git a/extensions/Needinfo/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Needinfo/template/en/default/hook/global/user-error-errors.html.tmpl
index 42d47e928..97c1672de 100644
--- a/extensions/Needinfo/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Needinfo/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -12,6 +12,6 @@
needinfo flag.
[% ELSIF error == "needinfo_blocked" %]
[% title = "Needinfo Request Blocked" %]
- [% user.identity FILTER html %] is not currently accepting "needinfo"
+ [% requestee.identity FILTER html %] is not currently accepting "needinfo"
requests.
[% END %]
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm
index 2dadd788a..eda12f734 100644
--- a/extensions/Review/Extension.pm
+++ b/extensions/Review/Extension.pm
@@ -456,7 +456,7 @@ sub _check_requestee {
return unless $flag->type->name eq 'review' || $flag->type->name eq 'feedback';
if ($flag->requestee->reviews_blocked) {
ThrowUserError('reviews_blocked',
- { user => $flag->requestee, flagtype => $flag->type->name });
+ { requestee => $flag->requestee, flagtype => $flag->type->name });
}
}
diff --git a/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl b/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl
index 4fcd47a68..112751076 100644
--- a/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl
+++ b/extensions/Review/template/en/default/hook/global/user-error-errors.html.tmpl
@@ -25,7 +25,7 @@
[% ELSIF error == "reviews_blocked" %]
[% title = "Request Blocked" %]
- [% user.identity FILTER html %] is not currently accepting
+ [% requestee.identity FILTER html %] is not currently accepting
'[% flagtype FILTER html %]' requests.
[% END %]