diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index f792d5b173..075c03da71 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -15,7 +15,10 @@ frappe.form.formatters = { return "
" + value + "
"; } }, - Data: function(value) { + Data: function(value, df) { + if (df && df.options == "URL") { + return `${value}`; + } return value==null ? "" : value; }, Select: function(value) { @@ -159,7 +162,7 @@ frappe.form.formatters = { return value || ""; }, DateRange: function(value) { - if($.isArray(value)) { + if(Array.isArray(value)) { return __("{0} to {1}", [frappe.datetime.str_to_user(value[0]), frappe.datetime.str_to_user(value[1])]); } else { return value || ""; diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 274e6ca3fb..7c8ac9ff48 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -169,9 +169,7 @@ def validate_url(txt, throw=False): except Exception: if throw: frappe.throw( - frappe._( - "'{0}' is not a valid URL" - ).format('' + txt +'') + frappe._("'{0}' is not a valid URL").format(frappe.bold(txt)) ) return False