From bedc62f0908c72b0cad5c1797559b0fc3cdde5c3 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Fri, 4 Apr 2014 16:26:45 +0530
Subject: [PATCH] Fixed Feed

---
 erpnext/home/doctype/feed/feed.json    | 82 +++++++++++++-------------
 erpnext/home/page/activity/activity.py |  9 +--
 2 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/erpnext/home/doctype/feed/feed.json b/erpnext/home/doctype/feed/feed.json
index 6578d48e24..755b8b83c7 100644
--- a/erpnext/home/doctype/feed/feed.json
+++ b/erpnext/home/doctype/feed/feed.json
@@ -1,61 +1,61 @@
 {
- "autoname": "_FEED.#####", 
- "creation": "2012-07-03 13:29:42.000000", 
- "docstatus": 0, 
- "doctype": "DocType", 
+ "autoname": "hash",
+ "creation": "2012-07-03 13:29:42.000000",
+ "docstatus": 0,
+ "doctype": "DocType",
  "fields": [
   {
-   "fieldname": "feed_type", 
-   "fieldtype": "Select", 
-   "label": "Feed Type", 
+   "fieldname": "feed_type",
+   "fieldtype": "Select",
+   "label": "Feed Type",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "doc_type", 
-   "fieldtype": "Data", 
-   "label": "Doc Type", 
+   "fieldname": "doc_type",
+   "fieldtype": "Data",
+   "label": "Doc Type",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "doc_name", 
-   "fieldtype": "Data", 
-   "label": "Doc Name", 
+   "fieldname": "doc_name",
+   "fieldtype": "Data",
+   "label": "Doc Name",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "subject", 
-   "fieldtype": "Data", 
-   "label": "Subject", 
+   "fieldname": "subject",
+   "fieldtype": "Data",
+   "label": "Subject",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "color", 
-   "fieldtype": "Data", 
-   "label": "Color", 
+   "fieldname": "color",
+   "fieldtype": "Data",
+   "label": "Color",
    "permlevel": 0
-  }, 
+  },
   {
-   "fieldname": "full_name", 
-   "fieldtype": "Data", 
-   "label": "Full Name", 
+   "fieldname": "full_name",
+   "fieldtype": "Data",
+   "label": "Full Name",
    "permlevel": 0
   }
- ], 
- "icon": "icon-rss", 
- "idx": 1, 
- "modified": "2013-12-20 19:24:07.000000", 
- "modified_by": "Administrator", 
- "module": "Home", 
- "name": "Feed", 
- "owner": "Administrator", 
+ ],
+ "icon": "icon-rss",
+ "idx": 1,
+ "modified": "2013-12-20 19:24:05.000000",
+ "modified_by": "Administrator",
+ "module": "Home",
+ "name": "Feed",
+ "owner": "Administrator",
  "permissions": [
   {
-   "email": 1, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 1, 
+   "email": 1,
+   "permlevel": 0,
+   "print": 1,
+   "read": 1,
+   "report": 1,
    "role": "System Manager"
   }
  ]
-}
\ No newline at end of file
+}
diff --git a/erpnext/home/page/activity/activity.py b/erpnext/home/page/activity/activity.py
index 8fab54a4b9..aeb7389490 100644
--- a/erpnext/home/page/activity/activity.py
+++ b/erpnext/home/page/activity/activity.py
@@ -3,10 +3,11 @@
 
 from __future__ import unicode_literals
 import frappe
+from frappe.utils import cint
 
 @frappe.whitelist()
 def get_feed(arg=None):
-	"""get feed"""	
+	"""get feed"""
 	roles = frappe.get_roles()
 	return frappe.db.sql("""select
 		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 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']]),
-		as_dict=1)
\ No newline at end of file
+		limit %s, %s""" % (','.join(['%s']*len(roles)), '%s', '%s'),
+		tuple(roles + [cint(frappe.form_dict['limit_start']), cint(frappe.form_dict['limit_page_length'])]),
+		as_dict=1)