From f0babb7f0fc392a93afe9cdc45fe22b1e7dd95cc Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 22 May 2012 13:41:51 +0530 Subject: [PATCH] fixes in cms --- erpnext/website/doctype/style_settings/style_settings.py | 4 +++- .../website/doctype/website_settings/website_settings.py | 2 +- install_erpnext.py | 9 +-------- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/erpnext/website/doctype/style_settings/style_settings.py b/erpnext/website/doctype/style_settings/style_settings.py index 8bae403781..233ae1d1c4 100644 --- a/erpnext/website/doctype/style_settings/style_settings.py +++ b/erpnext/website/doctype/style_settings/style_settings.py @@ -23,7 +23,9 @@ class DocType: from jinja2 import Template import os - with open(os.path.join(os.path.dirname(__file__), 'custom_template.css'), 'r') as f: + with open(os.path.join( + os.path.dirname(os.path.abspath(__file__)), + 'custom_template.css'), 'r') as f: temp = Template(f.read()) if not self.doc.font_size: diff --git a/erpnext/website/doctype/website_settings/website_settings.py b/erpnext/website/doctype/website_settings/website_settings.py index 5992e9c3a7..9390e740b8 100644 --- a/erpnext/website/doctype/website_settings/website_settings.py +++ b/erpnext/website/doctype/website_settings/website_settings.py @@ -50,7 +50,7 @@ class DocType: where docstatus=0 and ifnull(published,0)=1"""): DocList('Blog', name[0]).save() webnotes.conn.set_value('Blog', name[0], 'modified', name[1]) - + from webnotes.cms.make import make_web_core make_web_core() diff --git a/install_erpnext.py b/install_erpnext.py index be12702d88..c1bb2dad82 100644 --- a/install_erpnext.py +++ b/install_erpnext.py @@ -106,14 +106,7 @@ os.system("lib/wnf.py -l") # force sync all os.system("lib/wnf.py --sync_all -f") -# create website files -from webnotes.model.code import get_obj -# rewrite pages -ws = get_obj('Website Settings') -ws.rewrite_pages() -ss = get_obj('Style Settings') -ss.validate() -ss.on_update() +os.system("lib/wnf.py --cms") # set filemode false os.system("git config core.filemode false")