From cbdc22cf5db16ca648fe1cdf05e491cebfa8d905 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Mon, 30 Jun 2014 15:20:12 +0530
Subject: [PATCH] ToDo List: Default filter, avatar and Assigned To in list
 view

---
 frappe/core/doctype/todo/todo.json    | 14 +++++++++++++-
 frappe/core/doctype/todo/todo.py      |  2 +-
 frappe/core/doctype/todo/todo_list.js | 24 +++++++++++++-----------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/frappe/core/doctype/todo/todo.json b/frappe/core/doctype/todo/todo.json
index ec9e27e2b2..fb09893c2a 100644
--- a/frappe/core/doctype/todo/todo.json
+++ b/frappe/core/doctype/todo/todo.json
@@ -82,6 +82,16 @@
    "reqd": 0, 
    "search_index": 0
   }, 
+  {
+   "fieldname": "owner", 
+   "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
+   "in_list_view": 0, 
+   "label": "Assigned To", 
+   "options": "User", 
+   "permlevel": 0, 
+   "reqd": 1
+  }, 
   {
    "fieldname": "section_break_6", 
    "fieldtype": "Section Break", 
@@ -147,6 +157,7 @@
   {
    "fieldname": "assigned_by", 
    "fieldtype": "Link", 
+   "ignore_user_permissions": 1, 
    "label": "Assigned By", 
    "options": "User", 
    "permlevel": 0
@@ -160,7 +171,7 @@
  "in_dialog": 0, 
  "issingle": 0, 
  "max_attachments": 0, 
- "modified": "2014-06-20 06:20:11.947183", 
+ "modified": "2014-06-30 05:40:15.471434", 
  "modified_by": "Administrator", 
  "module": "Core", 
  "name": "ToDo", 
@@ -195,5 +206,6 @@
  ], 
  "read_only": 0, 
  "read_only_onload": 0, 
+ "search_fields": "description, reference_type, reference_name", 
  "title_field": "description"
 }
\ No newline at end of file
diff --git a/frappe/core/doctype/todo/todo.py b/frappe/core/doctype/todo/todo.py
index c5fcb02d05..650903b619 100644
--- a/frappe/core/doctype/todo/todo.py
+++ b/frappe/core/doctype/todo/todo.py
@@ -32,7 +32,7 @@ class ToDo(Document):
 		}).insert(ignore_permissions=True)
 
 
-# todo is viewable if either owner or assigned_to or System Manager in roles
+# NOTE: todo is viewable if either owner or assigned_to or System Manager in roles
 
 def get_permission_query_conditions(user):
 	if not user: user = frappe.session.user
diff --git a/frappe/core/doctype/todo/todo_list.js b/frappe/core/doctype/todo/todo_list.js
index 9a6b29c346..722547c02b 100644
--- a/frappe/core/doctype/todo/todo_list.js
+++ b/frappe/core/doctype/todo/todo_list.js
@@ -1,18 +1,20 @@
 frappe.listview_settings['ToDo'] = {
 	onload: function(me) {
-		// $(frappe.container.page)
-		// 	.find(".layout-main-section")
-		// 	.css({
-		// 		"background-color":"cornsilk",
-		// 		"min-height": "400px"
-		// 	})
-		if(user_roles.indexOf("System Manager")!==-1) {
-			frappe.route_options = {
-				"owner": user
-			}
-		}
+		frappe.route_options = {
+			"status": "Open",
+			"owner": user
+		};
 	},
 	set_title_left: function() {
 		frappe.set_route();
+	},
+
+	add_columns: [
+		{"content": "Assigned To", width:"15%", label: "Assigned To"}
+	],
+
+	prepare_data: function(data) {
+		data["user_for_avatar"] = data.owner;
+		data["Assigned To"] = data.owner===user ? null : (frappe.boot.user_info[data.owner] || {}).fullname;
 	}
 }