From 86cf971d935afea6661334abd42c8f34f8a9634e Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 26 Dec 2014 13:05:44 +0530 Subject: [PATCH] [minor] ignore feed during app install --- frappe/desk/doctype/feed/feed.py | 3 ++- frappe/public/build.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/desk/doctype/feed/feed.py b/frappe/desk/doctype/feed/feed.py index 2d286e7395..e01d571480 100644 --- a/frappe/desk/doctype/feed/feed.py +++ b/frappe/desk/doctype/feed/feed.py @@ -55,7 +55,8 @@ def update_feed(doc, method=None): "adds a new feed" if doc.doctype == "Feed": return - if frappe.flags.in_patch: + + if frappe.flags.in_patch or frappe.flags.in_install_app: return diff --git a/frappe/public/build.json b/frappe/public/build.json index 560d6a233e..bb4137f67a 100644 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -14,7 +14,7 @@ "public/js/frappe/misc/pretty_date.js", "public/js/lib/moment/moment.min.js", "public/js/lib/highlight.pack.js", - "website/js/website.js", + "website/js/website.js" ], "js/canvasResize.min.js": [ "website/js/jquery.exif.js",