commit 616c355d209df98d69eed780ea77941d83dbee2b
author Anand Doshi <anand@iwebnotes.com> Thu Jun 14 16:46:48 2012 +0530
committer Anand Doshi <anand@iwebnotes.com> Thu Jun 14 16:46:48 2012 +0530
tree 7dc8f6863f4728f868093a25f0bf2d6ee328f775
parent a86d7887f09e762a00ba47871f459b9e5f7f252d

fix in todos and email settings

erpnext/utilities/page/todo/todo.html

diff --git a/erpnext/utilities/page/todo/todo.html b/erpnext/utilities/page/todo/todo.html
index 8c50218..d49fc23 100644
--- a/erpnext/utilities/page/todo/todo.html
+++ b/erpnext/utilities/page/todo/todo.html
@@ -1,18 +1,21 @@
-<div class="layout-wrapper" style="min-height: 300px; background-color: #FFFDC9">	
-	<a class="close" onclick="window.history.back();">&times;</a>
-	<h1>To Do</h1>
-	<br>
+<div class="layout-wrapper" style="min-height: 300px; background-color: #FFFDC9">
+	<div class="appframe-area"></div>
 	<div>
-		<div id="todo-list">
-			<h4>My List</h4><br>
-			<div class="todo-content"></div>
+		<a class="close" onclick="window.history.back();">&times;</a>
+		<h1>To Do</h1>
+		<br>
+		<div>
+			<div id="todo-list">
+				<h4>My List</h4><br>
+				<div class="todo-content"></div>
+			</div>
+			<div id="assigned-todo-list">
+				<h4>Assigned to others</h4><br>
+				<div class="todo-content"></div>
+			</div>
 		</div>
-		<div id="assigned-todo-list">
-			<h4>Assigned to others</h4><br>
-			<div class="todo-content"></div>
+		<div style="margin-top: 21px; clear: both">
+			<button id="add-todo" class="btn btn-small"><i class="icon-plus"></i> Add</button>
 		</div>
 	</div>
-	<div style="margin-top: 21px; clear: both">
-		<button id="add-todo" class="btn btn-small"><i class="icon-plus"></i> Add</button>
-	</div>
 </div>
\ No newline at end of file

erpnext/utilities/page/todo/todo.js

diff --git a/erpnext/utilities/page/todo/todo.js b/erpnext/utilities/page/todo/todo.js
index 8cd8fc1..206becf 100644
--- a/erpnext/utilities/page/todo/todo.js
+++ b/erpnext/utilities/page/todo/todo.js
@@ -67,16 +67,18 @@
 		
 		todo.fullname = '';
 		if(todo.assigned_by) {
+			var assigned_by = wn.boot.user_info[todo.assigned_by]
 			todo.fullname = repl("[By %(fullname)s]  ", {
-				fullname: wn.boot.user_info[todo.assigned_by].fullname
+				fullname: (assigned_by ? assigned_by.fullname : todo.assigned_by),
 			});
 		}
 		
 		var parent_list = "#todo-list";
 		if(todo.owner !== user) {
 			parent_list = "#assigned-todo-list";
+			var owner = wn.boot.user_info[todo.owner];
 			todo.fullname = repl("[To %(fullname)s]  ", {
-				fullname: wn.boot.user_info[todo.owner].fullname
+				fullname: (owner ? owner.fullname : todo.owner),
 			});
 		}
 		parent_list += " div.todo-content";
@@ -197,4 +199,4 @@
 wn.pages.todo.onload = function() {
 	// load todos
 	erpnext.todo.refresh();
-}
+}
\ No newline at end of file