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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
erpnext/home/doctype/feed/feed.json
View File

@ -1,61 +1,61 @@
{ {
"autoname": "_FEED.#####", "autoname": "hash",
"creation": "2012-07-03 13:29:42.000000", "creation": "2012-07-03 13:29:42.000000",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"fields": [ "fields": [
{ {
"fieldname": "feed_type", "fieldname": "feed_type",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Feed Type", "label": "Feed Type",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "doc_type", "fieldname": "doc_type",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Doc Type", "label": "Doc Type",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "doc_name", "fieldname": "doc_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Doc Name", "label": "Doc Name",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "subject", "fieldname": "subject",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Subject", "label": "Subject",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "color", "fieldname": "color",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Color", "label": "Color",
"permlevel": 0 "permlevel": 0
}, },
{ {
"fieldname": "full_name", "fieldname": "full_name",
"fieldtype": "Data", "fieldtype": "Data",
"label": "Full Name", "label": "Full Name",
"permlevel": 0 "permlevel": 0
} }
], ],
"icon": "icon-rss", "icon": "icon-rss",
"idx": 1, "idx": 1,
"modified": "2013-12-20 19:24:07.000000", "modified": "2013-12-20 19:24:05.000000",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Home", "module": "Home",
"name": "Feed", "name": "Feed",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"email": 1, "email": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager" "role": "System Manager"
} }
] ]
} }

9
erpnext/home/page/activity/activity.py
View File

@ -3,10 +3,11 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
from frappe.utils import cint
@frappe.whitelist() @frappe.whitelist()
def get_feed(arg=None): def get_feed(arg=None):
"""get feed""" """get feed"""
roles = frappe.get_roles() roles = frappe.get_roles()
return frappe.db.sql("""select return frappe.db.sql("""select
distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.owner, distinct t1.name, t1.feed_type, t1.doc_type, t1.doc_name, t1.subject, t1.owner,
@ -17,6 +18,6 @@ def get_feed(arg=None):
and t2.permlevel = 0 and t2.permlevel = 0
and ifnull(t2.`read`,0) = 1 and ifnull(t2.`read`,0) = 1
order by t1.modified desc order by t1.modified desc
limit %s, %s""" % (','.join(['%s']*len(roles)), '%s', '%s'), 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) as_dict=1)