IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Do not update last seen notification ID when forced to enable 2FA." (#7222)

Browse Source
This commit is contained in:
Bianca Nenciu 2019-03-21 10:27:22 +02:00 committed by Régis Hanol
parent f7b156ffbd
commit fdd2e7f2e7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/widgets/user-notifications.js.es6
View File

@ -34,9 +34,10 @@ export default createWidget("user-notifications", {
limit = 40; limit = 40;
} }
const silent = this.currentUser.get("enforcedSecondFactor");
const stale = this.store.findStale( const stale = this.store.findStale(
"notification", "notification",
{ recent: true, limit }, { recent: true, silent, limit },
{ cacheKey: "recent-notifications" } { cacheKey: "recent-notifications" }
); );
@ -59,7 +60,9 @@ export default createWidget("user-notifications", {
stale stale
.refresh() .refresh()
.then(notifications => { .then(notifications => {
this.currentUser.set("unread_notifications", 0); if (!silent) {
this.currentUser.set("unread_notifications", 0);
}
state.notifications = notifications; state.notifications = notifications;
}) })
.catch(() => { .catch(() => {

2
config/locales/client.en.yml
View File

@ -803,7 +803,7 @@ en:
label: "Code" label: "Code"
rate_limit: "Please wait before trying another authentication code." rate_limit: "Please wait before trying another authentication code."
enable_description: | enable_description: |
Scan this QR code in a supported app (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a> and enter your authentication code. Scan this QR code in a supported app (<a href="https://www.google.com/search?q=authenticator+apps+for+android" target="_blank">Android</a> – <a href="https://www.google.com/search?q=authenticator+apps+for+ios" target="_blank">iOS</a>) and enter your authentication code.
disable_description: "Please enter the authentication code from your app" disable_description: "Please enter the authentication code from your app"
show_key_description: "Enter manually" show_key_description: "Enter manually"
extended_description: | extended_description: |