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
mozilla-bteam · Apr 28, 2015 · 7bb7340 · 7bb7340
1 parent 2d50ce5
commit 7bb7340
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 %]