From eb54ce4b77b6936b114a2ea271ff1c0d2e745967 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 25 Feb 2014 17:50:36 +0530 Subject: [PATCH] fixes to sync static --- frappe/website/doctype/web_page/web_page.py | 17 ++++++++++++++++- frappe/website/statics.py | 3 ++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index 6bd7cd98e5..7f4dcd8abe 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -4,8 +4,23 @@ from __future__ import unicode_literals import frappe, os, time from frappe.website.website_generator import WebsiteGenerator +from frappe.website.utils import cleanup_page_name -class DocType(WebsiteGenerator): +class DocType(WebsiteGenerator): + def autoname(self): + self.doc.name = cleanup_page_name(self.doc.title) + if frappe.conn.exists("Web Page", self.doc.name): + last = frappe.conn.sql("""select name from `tabWeb Page` + where name like '{}%' order by name desc limit 1""".format(self.doc.name)) + count = last[0][0].replace(self.doc.name, "") + if count and "-" in name: + count = cint(count.split("-")[1]) + else: + count = "1" + + self.doc.name = self.doc.name + "-" + count + + def validate(self): for d in self.doclist.get({"parentfield": "toc"}): if d.web_page == self.doc.name: diff --git a/frappe/website/statics.py b/frappe/website/statics.py index 6d15b2064f..e705cb8f8b 100644 --- a/frappe/website/statics.py +++ b/frappe/website/statics.py @@ -138,7 +138,8 @@ class sync(object): frappe.delete_doc("Web Page", page.doc.name) page.insert() # retry - + + # update timestamp route_bean = frappe.bean("Website Route", {"ref_doctype": "Web Page", "docname": page.doc.name})