vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[website] fix add sidebar

Browse source
This commit is contained in:
Rushabh Mehta 2014-08-25 16:25:26 +05:30
parent ceb862a0cf
commit b9df7dc3e2
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/templates/includes/static_index.html
View file

@ -2,7 +2,7 @@
<div class="row">
<div class="col-md-8">
<ul class="list-group">
{% for item in items[1:] %}
{% for item in items %}
<li class="list-group-item">
<div class="row">
<div class="col-xs-1 text-right" style="padding-right: 0px;"><b>{{ loop.index }}.</b></div>

28
frappe/website/website_generator.py
View file

@ -156,22 +156,30 @@ class WebsiteGenerator(Document):
order by idx""", as_dict=True)
if self.meta.get_field("parent_website_route"):
children = frappe.db.sql("""select name, page_name,
parent_website_route, {title_field} as title from `tab{doctype}`
where ifnull(parent_website_route,'')=%s
order by {order_by}""".format(
doctype = self.doctype,
title_field = getattr(self, "page_title_field", "name"),
order_by = getattr(self, "order_by", "idx asc")),
self.get_route(), as_dict=True)
children = self.get_children_of(self.get_route())
for c in children:
c.name = make_route(c)
if not children and self.parent_website_route:
children = self.get_children_of(self.parent_website_route)
return children
else:
return []
def get_children_of(self, route):
children = frappe.db.sql("""select name, page_name,
parent_website_route, {title_field} as title from `tab{doctype}`
where ifnull(parent_website_route,'')=%s
order by {order_by}""".format(
doctype = self.doctype,
title_field = getattr(self, "page_title_field", "name"),
order_by = getattr(self, "order_by", "idx asc")),
route, as_dict=True)
for c in children:
c.name = make_route(c)
return children
def get_next(self):
if self.meta.get_field("parent_website_route") and self.parent_website_route:
route = self.get_route()