Merge branch 'master' of github.com:webnotes/erpnext into handlerupdate
This commit is contained in:
commit
d0f26026af
@ -45,10 +45,10 @@ erpnext.todo.ToDoItem = Class.extend({
|
||||
'Low':''
|
||||
}
|
||||
todo.labelclass = label_map[todo.priority];
|
||||
todo.userdate = dateutil.str_to_user(todo.date);
|
||||
todo.userdate = dateutil.str_to_user(todo.date) || '';
|
||||
if(todo.reference_name && todo.reference_type) {
|
||||
todo.link = repl('<a href="#!Form/%(reference_type)s/%(reference_name)s">\
|
||||
%(reference_name)s</a>', todo);
|
||||
%(reference_type)s: %(reference_name)s</a>', todo);
|
||||
} else if(todo.reference_type) {
|
||||
todo.link = repl('<a href="#!List/%(reference_type)s">\
|
||||
%(reference_type)s</a>', todo);
|
||||
@ -60,7 +60,7 @@ erpnext.todo.ToDoItem = Class.extend({
|
||||
<span class="label %(labelclass)s">%(priority)s</span>\
|
||||
<span class="help" style="margin-right: 7px">%(userdate)s</span>\
|
||||
%(description)s</span>\
|
||||
<span class="ref_link">→\
|
||||
<span class="ref_link">→ \
|
||||
%(link)s</span>\
|
||||
<a href="#" class="close">×</a>\
|
||||
</div>', todo));
|
||||
|
Loading…
Reference in New Issue
Block a user