nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-21 18:29:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix in todos and email settings

Browse Source
This commit is contained in:
Anand Doshi
2012-06-14 16:46:48 +05:30
parent a86d7887f0
commit 616c355d20
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
erpnext/utilities/page/todo/todo.html
View File

@@ -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>

8
erpnext/utilities/page/todo/todo.js
View File

@@ -67,16 +67,18 @@ erpnext.todo.ToDoItem = Class.extend({
todo.fullname = '';
if(todo.assigned_by) {
var assigned_by = wn.boot.user_info[todo.assigned_by]
todo.fullname = repl("[By %(fullname)s] &nbsp;", {
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] &nbsp;", {
fullname: wn.boot.user_info[todo.owner].fullname
fullname: (owner ? owner.fullname : todo.owner),
});
}
parent_list += " div.todo-content";
@@ -197,4 +199,4 @@ erpnext.todo.save = function(btn) {
wn.pages.todo.onload = function() {
// load todos
erpnext.todo.refresh();
}
}