Merge pull request #1987 from anandpdoshi/anand-july-25
[fix] Feed listing based on permissions
diff --git a/erpnext/home/doctype/feed/feed.py b/erpnext/home/doctype/feed/feed.py
index 80ef6df..df8ccb2 100644
--- a/erpnext/home/doctype/feed/feed.py
+++ b/erpnext/home/doctype/feed/feed.py
@@ -4,6 +4,7 @@
from __future__ import unicode_literals
import frappe
import frappe.defaults
+import frappe.permissions
from frappe.model.document import Document
class Feed(Document):
@@ -19,6 +20,9 @@
def get_permission_query_conditions(user):
if not user: user = frappe.session.user
+ if not frappe.permissions.apply_user_permissions("Feed", "read", user):
+ return ""
+
user_permissions = frappe.defaults.get_user_permissions(user)
can_read = frappe.get_user(user).get_can_read()