From 3a50b342ef2db085c4aa860318af673ea5243847 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 6 Jul 2011 14:50:30 +0530 Subject: [PATCH] feed fix --- .gitignore | 1 + home/__init__.py | 7 +++++-- setup/doctype/company/company.txt | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 56149a0d5d3..e9c8fc66875 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc *.comp.js +*.txt .DS_Store server_tools patch.log diff --git a/home/__init__.py b/home/__init__.py index bcfcbb70091..09c5c1fa499 100644 --- a/home/__init__.py +++ b/home/__init__.py @@ -3,7 +3,7 @@ from webnotes import msgprint feed_dict = { # Project - 'Project': ['[%(status)s] %(subject)s', '#000080'], + 'Project': ['[%(status)s]', '#000080'], # Sales 'Lead': ['%(lead_name)s', '#000080'], @@ -91,8 +91,11 @@ def update_feed1(doc): subject = subject % doc.fields make_feed(doc, subject, color) -def update_feed(doc): +def update_feed(doc, method): "adds a new feed" + if method=='validate': + return + subject, color = feed_dict.get(doc.doctype, [None, None]) if subject: subject = subject % doc.fields diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index 15ba781a67e..a7498d6e057 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -5,7 +5,7 @@ { 'creation': '2010-08-08 17:08:55', 'docstatus': 0, - 'modified': '2011-07-01 17:43:29', + 'modified': '2011-07-06 11:42:34', 'modified_by': 'Administrator', 'owner': 'Administrator' },