Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7506 from mntechnique/hotfix

Browse Source 
[Fix] Project: Enabled autocomplete for project users
This commit is contained in:
Nabin Hait 2017-01-17 11:27:37 +05:30 committed by GitHub
commit 0681c77f6a
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
erpnext/projects/doctype/project/project.py
View File

@ -8,6 +8,8 @@ from frappe.utils import flt, getdate, get_url
from frappe import _ from frappe import _
from frappe.model.document import Document from frappe.model.document import Document
from erpnext.controllers.queries import get_filters_cond
from frappe.desk.reportview import get_match_cond
class Project(Document): class Project(Document):
def get_feed(self): def get_feed(self):
@ -215,12 +217,29 @@ def get_list_context(context=None):
} }
def get_users_for_project(doctype, txt, searchfield, start, page_len, filters): def get_users_for_project(doctype, txt, searchfield, start, page_len, filters):
conditions = []
return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name) return frappe.db.sql("""select name, concat_ws(' ', first_name, middle_name, last_name)
from `tabUser` from `tabUser`
where enabled=1 where enabled=1
and name not in ("Guest", "Administrator") and name not in ("Guest", "Administrator")
and ({key} like %(txt)s
or full_name like %(txt)s)
{fcond} {mcond}
order by order by
name asc""") if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
if(locate(%(_txt)s, full_name), locate(%(_txt)s, full_name), 99999),
idx desc,
name, full_name
limit %(start)s, %(page_len)s""".format(**{
'key': searchfield,
'fcond': get_filters_cond(doctype, filters, conditions),
'mcond': get_match_cond(doctype)
}), {
'txt': "%%%s%%" % txt,
'_txt': txt.replace("%", ""),
'start': start,
'page_len': page_len
})
@frappe.whitelist() @frappe.whitelist()
def get_cost_center_name(project): def get_cost_center_name(project):