Переглянути джерело

fix: Validation error

version-14
Suraj Shetty 3 роки тому
джерело
коміт
a396afc7d4
2 змінених файлів з 11 додано та 14 видалено
  1. +0
    -3
      cypress/integration/control_phone.js
  2. +11
    -11
      frappe/utils/__init__.py

+ 0
- 3
cypress/integration/control_phone.js Переглянути файл

@@ -71,10 +71,8 @@ context("Control Phone", () => {
//Adding a new entry for the created custom doctype
cy.fill_field("title", "Test Phone 1");
cy.fill_field("phone", "+91-9823341234");
cy.wait(500);
cy.get_field("phone").should("have.value", "9823341234");
cy.click_doc_primary_button("Save");
cy.wait(500);
cy.get_doc("Doctype With Phone", "Test Phone 1").then((doc) => {
let value = doc.data.phone;
expect(value).to.equal("+91-9823341234");
@@ -86,7 +84,6 @@ context("Control Phone", () => {
cy.get(".selected-phone .country").should("have.text", "");
cy.fill_field("title", "Test Phone 2");
cy.fill_field("phone", "+91-9823341291");
cy.wait(500);
cy.get_field("phone").should("have.value", "9823341291");
cy.intercept("POST", "/api/method/frappe.desk.form.save.savedocs").as("save_form");
cy.click_doc_primary_button("Save");


+ 11
- 11
frappe/utils/__init__.py Переглянути файл

@@ -89,24 +89,24 @@ def validate_phone_number_with_country_code(phone_number, fieldname):

if not phone_number:
return

valid_number = False
error_message = _("Phone Number {0} set in field {1} is not valid.")
error_title = _("Invalid Phone Number")
try:
if is_valid_number(parse(phone_number)):
if valid_number := is_valid_number(parse(phone_number)):
return True
error_message = _("Phone Number {0} set in field {1} is not valid.")
error_title = _("Invalid Phone Number")
except NumberParseException as e:
if e.error_type == NumberParseException.INVALID_COUNTRY_CODE:
error_message = _("Please select a country code for field {1}.")
error_title = _("Country Code Required")
if e.error_type == NumberParseException.NOT_A_NUMBER:
error_message = _("Phone Number {0} set in field {1} is not valid.")
error_title = _("Invalid Phone Number")
finally:
frappe.throw(
error_message.format(frappe.bold(phone_number), frappe.bold(fieldname)),
title=error_title,
exc=frappe.InvalidPhoneNumberError,
)
if not valid_number:
frappe.throw(
error_message.format(frappe.bold(phone_number), frappe.bold(fieldname)),
title=error_title,
exc=frappe.InvalidPhoneNumberError,
)


def validate_phone_number(phone_number, throw=False):


Завантаження…
Відмінити
Зберегти