From c9629a481da750bfe6f58b3924a089021fbc914f Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 12 Feb 2013 12:54:58 +0530 Subject: [PATCH 1/3] fetch favicon from website settings --- website/utils.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/website/utils.py b/website/utils.py index cd1b6a5974..48ca844ae9 100644 --- a/website/utils.py +++ b/website/utils.py @@ -19,7 +19,6 @@ from __future__ import unicode_literals import os import conf import webnotes -from webnotes.utils import cstr page_map = { 'Web Page': webnotes._dict({ @@ -52,7 +51,7 @@ def render(page_name): html = get_html(page_name) else: html = get_html('index') - except Exception, e: + except Exception: html = get_html('error') from webnotes.handler import eprint, print_zip @@ -244,7 +243,7 @@ def get_outer_env(): }) settings = webnotes.doc("Website Settings", "Website Settings") - for k in ["brand_html", "copyright", "address", "top_bar_background"]: + for k in ["brand_html", "copyright", "address", "top_bar_background", "favicon"]: if k in settings.fields: ret[k] = settings.fields[k] From 3422bdfec5edc9ec99c35a861f9ca4900ce3e330 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 12 Feb 2013 13:03:25 +0530 Subject: [PATCH 2/3] added Website Manager role in install --- startup/install.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startup/install.py b/startup/install.py index d94fd64b0e..b42b7163c0 100644 --- a/startup/install.py +++ b/startup/install.py @@ -33,7 +33,7 @@ def make_roles(): "Partner", "Projects User", "Purchase Manager", "Purchase Master Manager", "Purchase User", "Quality Manager", "Sales Manager", "Sales Master Manager", "Sales User", "Supplier", "Support Manager", - "Support Team"] + "Support Team", "Website Manager"] for r in roles: doc = webnotes.doc(fielddata = { From 9b051db7d636d78e6bbad3d11fa58d9914691e49 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Tue, 12 Feb 2013 13:04:15 +0530 Subject: [PATCH 3/3] show page name in web page list view --- website/doctype/web_page/web_page.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt index 788f1c04d1..861ac86e39 100644 --- a/website/doctype/web_page/web_page.txt +++ b/website/doctype/web_page/web_page.txt @@ -1,8 +1,8 @@ [ { - "creation": "2013-01-10 16:34:32", + "creation": "2013-01-27 16:31:21", "docstatus": 0, - "modified": "2013-01-22 14:57:27", + "modified": "2013-02-12 09:33:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -66,6 +66,7 @@ "doctype": "DocField", "fieldname": "page_name", "fieldtype": "Data", + "in_list_view": 1, "label": "Page Name", "read_only": 1 },