Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into edge

Browse Source
This commit is contained in:
Rushabh Mehta 2013-02-12 08:40:01 +01:00
commit 17fc0fe2d2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
startup/install.py
View File

@ -33,7 +33,7 @@ def make_roles():
"Partner", "Projects User", "Purchase Manager", "Purchase Master Manager", "Partner", "Projects User", "Purchase Manager", "Purchase Master Manager",
"Purchase User", "Quality Manager", "Sales Manager", "Purchase User", "Quality Manager", "Sales Manager",
"Sales Master Manager", "Sales User", "Supplier", "Support Manager", "Sales Master Manager", "Sales User", "Supplier", "Support Manager",
"Support Team"] "Support Team", "Website Manager"]
for r in roles: for r in roles:
doc = webnotes.doc(fielddata = { doc = webnotes.doc(fielddata = {

5
website/doctype/web_page/web_page.txt
View File

@ -1,8 +1,8 @@
[ [
{ {
"creation": "2013-01-10 16:34:32", "creation": "2013-01-27 16:31:21",
"docstatus": 0, "docstatus": 0,
"modified": "2013-01-22 14:57:27", "modified": "2013-02-12 09:33:47",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -66,6 +66,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "page_name", "fieldname": "page_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Page Name", "label": "Page Name",
"read_only": 1 "read_only": 1
}, },

5
website/utils.py
View File

@ -19,7 +19,6 @@ from __future__ import unicode_literals
import os import os
import conf import conf
import webnotes import webnotes
from webnotes.utils import cstr
page_map = { page_map = {
'Web Page': webnotes._dict({ 'Web Page': webnotes._dict({
@ -52,7 +51,7 @@ def render(page_name):
html = get_html(page_name) html = get_html(page_name)
else: else:
html = get_html('index') html = get_html('index')
except Exception, e: except Exception:
html = get_html('error') html = get_html('error')
from webnotes.handler import eprint, print_zip from webnotes.handler import eprint, print_zip
@ -244,7 +243,7 @@ def get_outer_env():
}) })
settings = webnotes.doc("Website Settings", "Website Settings") 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: if k in settings.fields:
ret[k] = settings.fields[k] ret[k] = settings.fields[k]