vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of github.com:webnotes/wnframework into handlerupdate

Browse source
This commit is contained in:
Rushabh Mehta 2012-03-22 06:35:16 +01:00
commit b3ee54f917
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
js/legacy/wn/widgets/form/assign_to.js
View file

@ -79,8 +79,7 @@ wn.widgets.form.sidebar.AssignTo = Class.extend({
{fieldtype:'Link', fieldname:'assign_to', options:'Profile',
label:'Assign To',
description:'Add to To Do List of', reqd:true},
{fieldtype:'Data', fieldname:'description', label:'Comment',
'default': 'Assigned by ' + user},
{fieldtype:'Data', fieldname:'description', label:'Comment'},
{fieldtype:'Date', fieldname:'date', label:'Complete By'},
{fieldtype:'Select', fieldname:'priority', label:'Priority',
options:'Low\nMedium\nHigh', 'default':'Medium'},

2
py/webnotes/boot.py
View file

@ -78,7 +78,7 @@ def get_fullnames():
import webnotes
ret = webnotes.conn.sql("""select name,
concat(ifnull(first_name, ''),
if(ifnull(first_name, '')!='', ' ', ''), ifnull(last_name, '')),
if(ifnull(last_name, '')!='', ' ', ''), ifnull(last_name, '')),
user_image, gender
from tabProfile where ifnull(enabled, 0)=1""", as_list=1)
d = {}