1119184 - Securemail incorrectly displays " You will have to contact bugzilla-admin@foo to reset your password." for whines

Status: RESOLVED FIXED

(bugzilla.mozilla.org :: Extensions, defect)

Description

[Ed Morley [:emorley]]

Broken out from bug 815284.

For whines, if the email needs encrypting, securemail currently outputs:

{
This email would have contained sensitive information, but you have not set
a PGP/GPG key or SMIME certificate in the "Secure Mail" section of your user
preferences.

You will have to contact [e-mail] to reset your password.
}

We need an additional ELSIF here, since it's not enough to assume !bug_id means password reset:
https://github.com/mozilla/webtools-bmo-bugzilla/blob/cf7ddf8474fa15955e409d28b2956c6749407f6f/extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl#L13

Comment 1

[David Lawrence [:dkl]]

Attachment: 1119184_1.patch

Comment 2

[Ed Morley [:emorley]]

Comment on attachment 8545986 [details] [diff] [review]
1119184_1.patch

Review of attachment 8545986 [details] [diff] [review]:
-----------------------------------------------------------------

Thanks for looking at this so quickly! :-)

With this patch, whines are not shown the "In order to receive the full text of similar mails in the future, please
go to:" message that is applicable to them. Perhaps the bud_id conditional path could be split up?

Comment 3

[David Lawrence [:dkl]]

Attachment: 1119184_2.patch

Comment 4

[Ed Morley [:emorley]]

Comment on attachment 8546088 [details] [diff] [review]
1119184_2.patch

Review of attachment 8546088 [details] [diff] [review]:
-----------------------------------------------------------------

::: extensions/SecureMail/template/en/default/account/email/encryption-required.txt.tmpl
@@ +10,3 @@
>  
>  You can see this bug's current state at:
>  [%+ urlbase %]show_bug.cgi?id=[% bug_id %]

An additional |IF bug_id| is needed around this last paragraph, since there is no bug_id for multi-bug whines.

Comment 5

[David Lawrence [:dkl]]

(In reply to Ed Morley [:edmorley] from comment #4)
> Comment on attachment 8546088 [details] [diff] [review]
> 1119184_2.patch
> 
> Review of attachment 8546088 [details] [diff] [review]:
> -----------------------------------------------------------------
> 
> :::
> extensions/SecureMail/template/en/default/account/email/encryption-required.
> txt.tmpl
> @@ +10,3 @@
> >  
> >  You can see this bug's current state at:
> >  [%+ urlbase %]show_bug.cgi?id=[% bug_id %]
> 
> An additional |IF bug_id| is needed around this last paragraph, since there
> is no bug_id for multi-bug whines.

Oops. good catch. New patch.

Comment 6

[David Lawrence [:dkl]]

Attachment: 1119184_3.patch

Comment 7

[:glob ✱]

Comment on attachment 8546092 [details] [diff] [review]
1119184_3.patch

Review of attachment 8546092 [details] [diff] [review]:
-----------------------------------------------------------------

r=glob

Comment 8

[David Lawrence [:dkl]]

To ssh://[e-mail]/webtools/bmo/bugzilla.git
   cc0c733..5bf6a94  master -> master