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

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

Browse Source
This commit is contained in:
Anand Doshi 2012-07-31 19:18:44 +05:30
commit 33987a0ad2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/website/blog.py
View File

@ -56,7 +56,7 @@ def get_recent_blog_list(args=None):
if not args: args = webnotes.form_dict
query = """\
select name, title, left(content, 100) as content
select name, page_name, title, left(content, 100) as content
from tabBlog
where ifnull(published,0)=1 and
name!=%(name)s order by creation desc"""

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

@ -59,7 +59,7 @@ erpnext.blog.render_recent_list = function(wrapper) {
hide_refresh: true,
render_row: function(parent, data) {
if(data.content && data.content.length>=100) data.content += '...';
parent.innerHTML = repl('<a href="%(name)s.html">%(title)s</a>\
parent.innerHTML = repl('<a href="%(page_name)s.html">%(title)s</a>\
<div class="comment">%(content)s</div><br>', data);
// adjust page height depending on sidebar height