From 32ca0b18471a04cab9838d9f1327c9cef63eebb6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 28 Nov 2014 16:47:36 +0530 Subject: [PATCH 1/3] Fixes for invalid date --- frappe/public/js/frappe/form/control.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/control.js b/frappe/public/js/frappe/form/control.js index 955d648a4a..b2c76fdf20 100644 --- a/frappe/public/js/frappe/form/control.js +++ b/frappe/public/js/frappe/form/control.js @@ -440,6 +440,7 @@ frappe.ui.form.ControlDate = frappe.ui.form.ControlData.extend({ if(!dateutil.validate(value)) { msgprint (__("Date must be in format: {0}", [sys_defaults.date_format || "yyyy-mm-dd"])); callback(""); + return; } return callback(value); } From 88008f813a7184966240928a42314446891afc63 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 28 Nov 2014 16:48:07 +0530 Subject: [PATCH 2/3] do not copy page name while copying webpage --- frappe/website/doctype/web_page/web_page.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.json b/frappe/website/doctype/web_page/web_page.json index ce78216e5e..1a4056428f 100644 --- a/frappe/website/doctype/web_page/web_page.json +++ b/frappe/website/doctype/web_page/web_page.json @@ -1,5 +1,5 @@ { - "creation": "2013-03-28 10:35:30", + "creation": "2013-03-28 10:35:30", "description": "Page to show on the website\n", "docstatus": 0, "doctype": "DocType", @@ -25,6 +25,7 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Page Name", + "no_copy": 1, "permlevel": 0, "read_only": 0 }, @@ -40,6 +41,7 @@ "fieldtype": "Read Only", "hidden": 1, "label": "Parent Website Route", + "no_copy": 1, "options": "", "permlevel": 0 }, @@ -171,7 +173,7 @@ "icon": "icon-file-alt", "idx": 1, "max_attachments": 20, - "modified": "2014-08-19 02:19:05.426465", + "modified": "2014-11-28 15:00:09.806213", "modified_by": "Administrator", "module": "Website", "name": "Web Page", From b797ef1bab3dff7def56b9193bccc0dfa6a90b36 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 2 Dec 2014 11:42:40 +0530 Subject: [PATCH 3/3] fixes in website generator --- frappe/website/website_generator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index 5b200b7052..98fdc70b9d 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -98,7 +98,7 @@ class WebsiteGenerator(Document): if old_routes: for old_route in old_routes: - clear_cache(old_route) + clear_cache(make_route(old_route)) frappe.db.sql("""update `tab{0}` set parent_website_route = replace(parent_website_route, %s, %s),