From 306623e1b1e6af866635b9f280347852db5b1c2a Mon Sep 17 00:00:00 2001
From: Charles-Henri Decultot <chdecultot@dokos.io>
Date: Mon, 18 Dec 2023 12:37:02 +0000
Subject: [PATCH] Merge branch 'fix-website' into 'develop' (dokos/dodock!1146)
fix(web): Fix password reset status code
See merge request dokos/dodock!1146
(cherry picked from commit 7ea8dffc07123e07433c59fe7642be0791865214)
b029ca92 fix(web): Fix password reset status code
38a0e2af fix(web_page_view): Fix missing variable
---
frappe/core/doctype/user/user.py | 3 +--
frappe/www/website_script.js | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py
index 1cc1fa8289..6c92f36dc3 100644
--- a/frappe/core/doctype/user/user.py
+++ b/frappe/core/doctype/user/user.py
@@ -1093,9 +1093,8 @@ def reset_password(user: str) -> str:
msg=_("Password reset instructions have been sent to your email"),
title=_("Password Email Sent"),
)
-
except frappe.DoesNotExistError:
- frappe.local.response["http_status_code"] = 400
+ frappe.local.response["http_status_code"] = 404
frappe.clear_messages()
return "not found"
diff --git a/frappe/www/website_script.js b/frappe/www/website_script.js
index 75c0a63bca..a95b21313e 100644
--- a/frappe/www/website_script.js
+++ b/frappe/www/website_script.js
@@ -19,6 +19,7 @@ ga('send', 'pageview');
{% if enable_view_tracking %}
if (navigator.doNotTrack != 1 && !window.is_404) {
frappe.ready(() => {
+ let browser = frappe.utils.get_browser();
let query_params = frappe.utils.get_query_params();
// Get visitor ID based on browser uniqueness
--
GitLab