Merge branch 'model-cleanup' of github.com:frappe/erpnext into model-cleanup

This commit is contained in:
Nabin Hait 2014-04-07 12:01:59 +05:30
commit 9f66c306ea
2 changed files with 46 additions and 45 deletions

View File

@ -1,5 +1,5 @@
{
"autoname": "_FEED.#####",
"autoname": "hash",
"creation": "2012-07-03 13:29:42.000000",
"docstatus": 0,
"doctype": "DocType",
@ -43,7 +43,7 @@
],
"icon": "icon-rss",
"idx": 1,
"modified": "2013-12-20 19:24:07.000000",
"modified": "2013-12-20 19:24:05.000000",
"modified_by": "Administrator",
"module": "Home",
"name": "Feed",

View File

@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe
from frappe.utils import cint
@frappe.whitelist()
def get_feed(arg=None):
@ -18,5 +19,5 @@ def get_feed(arg=None):
and ifnull(t2.`read`,0) = 1
order by t1.modified desc
limit %s, %s""" % (','.join(['%s']*len(roles)), '%s', '%s'),
tuple(roles + [frappe.form_dict['limit_start'], frappe.form_dict['limit_page_length']]),
tuple(roles + [cint(frappe.form_dict['limit_start']), cint(frappe.form_dict['limit_page_length'])]),
as_dict=1)