diff --git a/frappe/__version__.py b/frappe/__version__.py index b56d675263..8355eb42a9 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1 +1 @@ -__version__ = "4.6.1" +__version__ = "4.7.0" diff --git a/frappe/hooks.py b/frappe/hooks.py index 682ac1fa7a..0c5a91a262 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -3,7 +3,7 @@ app_title = "Frappe Framework" app_publisher = "Web Notes Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "assets/frappe/images/frappe.svg" -app_version = "4.6.1" +app_version = "4.7.0" app_color = "#3498db" app_email = "support@frappe.io" 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); } diff --git a/frappe/templates/pages/style_settings.css b/frappe/templates/pages/style_settings.css index 566485b4d1..8aea1747e9 100644 --- a/frappe/templates/pages/style_settings.css +++ b/frappe/templates/pages/style_settings.css @@ -5,7 +5,7 @@ body { {% if doc.background_image %} - background: url("../{{ doc.background_image }}") repeat; + background: url("{{ doc.background_image }}") repeat; {% elif doc.background_color %} background-color: #{{ doc.background_color }}; background-image: none; 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", 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), diff --git a/setup.py b/setup.py index 38dd4061d9..590ede3757 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import os -version = "4.6.1" +version = "4.7.0" with open("requirements.txt", "r") as f: install_requires = f.readlines()