From deb8eb99ed214cc7878daa055d5dc013f78458f4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 18 Jul 2011 13:41:35 +0530 Subject: [PATCH] fixed server_tools.server_tools --- home/page/my_company/my_company.js | 5 ++++- startup/event_handlers.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/home/page/my_company/my_company.js b/home/page/my_company/my_company.js index 8b1b44ff9a..0850607644 100644 --- a/home/page/my_company/my_company.js +++ b/home/page/my_company/my_company.js @@ -143,7 +143,10 @@ MemberList.prototype.make_list = function() { var c1 = repl(' AND (first_name LIKE "%(txt)s" OR last_name LIKE "%(txt)s" OR name LIKE "%(txt)s")', {txt:'%' + me.search_inp.value + '%'}); } - this.query = repl("SELECT distinct ifnull(name,''), ifnull(concat_ws(' ', first_name, last_name),''), ifnull(messanger_status,''), ifnull(gender,''), ifnull(file_list,''), 0, enabled from tabProfile where docstatus != 2 AND name not in ('Guest','Administrator') %(cond)s ORDER BY name asc",{cond:c1}); + this.query = repl("SELECT distinct ifnull(name,''), ifnull(concat_ws(' ', first_name, last_name),''), \ + ifnull(messanger_status,''), ifnull(gender,''), ifnull(file_list,''), 0, enabled, last_login \ + from tabProfile where docstatus != 2 AND name not in ('Guest','Administrator') %(cond)s \ + ORDER BY name asc",{cond:c1}); } this.lst.make(this.lst_area); this.lst.show_cell= function(cell, ri, ci, d) { diff --git a/startup/event_handlers.py b/startup/event_handlers.py index 56391397b1..53b979e066 100644 --- a/startup/event_handlers.py +++ b/startup/event_handlers.py @@ -33,7 +33,7 @@ def update_account_details(): webnotes.conn.set_global('days_to_expiry', webnotes.form_dict.get('days_to_expiry')) if webnotes.form_dict.get('first_name'): - from server_tools.server_tools.gateway_utils import update_user_details + from server_tools.gateway_utils import update_user_details update_user_details() #