Shiloh/brotherton-erpnext
1
0
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-10 08:47:17 +01:00
commit 4050ffa409
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
website/helpers/product.py
View File

@ -29,6 +29,8 @@ def get_product_info(item_code):
@webnotes.whitelist(allow_guest=True) @webnotes.whitelist(allow_guest=True)
def get_product_list(search=None, product_group=None, start=0, limit=10): def get_product_list(search=None, product_group=None, start=0, limit=10):
# DOUBT: why is product_group param passed?
# base query # base query
query = """select name, item_name, page_name, website_image, item_group, query = """select name, item_name, page_name, website_image, item_group,
web_long_description as website_description web_long_description as website_description
@ -70,8 +72,8 @@ def get_product_list_for_group(product_group=None, start=0, limit=10):
def get_child_groups(item_group_name): def get_child_groups(item_group_name):
item_group = webnotes.doc("Item Group", item_group_name) item_group = webnotes.doc("Item Group", item_group_name)
return webnotes.conn.sql("""select name return webnotes.conn.sql("""select name
from `tabItem Group` where lft>=%(lft)s and rgt<=%(rgt)s""" \ from `tabItem Group` where lft>=%(lft)s and rgt<=%(rgt)s
% item_group.fields) and show_in_website = 1""", item_group.fields)
def get_group_item_count(item_group): def get_group_item_count(item_group):
child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(item_group)]) child_groups = ", ".join(['"' + i[0] + '"' for i in get_child_groups(item_group)])

2
website/templates/js/blog_page.js
View File

@ -52,7 +52,7 @@ $(document).ready(function() {
$.ajax({ $.ajax({
method: "POST", type: "POST",
url: "server.py", url: "server.py",
data: args, data: args,
dataType: "json", dataType: "json",