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

Merge pull request #48 from nijil/master

Browse source 
Remove popup message in login validation
This commit is contained in:
Nabin Hait 2011-12-26 00:54:57 -08:00
commit dc033fe219
3 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
py/build/version.py
View file

@ -184,7 +184,6 @@ class VersionControl:
"""
import os
for wt in os.walk(self.root_path, followlinks = True):
# ignore folders
for folder in self.ignore_folders:
if folder in wt[1]:
@ -455,4 +454,4 @@ if __name__=='__main__':
import os, sys
sys.path.append('py')
sys.path.append('lib/py')
unittest.main()
unittest.main()

4
py/core/page/login_page/login_page.js
View file

@ -18,7 +18,7 @@ pscript.onLoginReply = function(r, rtext) {
if(r.message=="Logged In"){
window.location.href='index.html' + (get_url_arg('page') ? ('?page='+get_url_arg('page')) : '');
} else {
$i('login_message').innerHTML = '<span style="color: RED;">'+eval(r.message)+'</span>';
$i('login_message').innerHTML = '<span style="color: RED;">'+(r.message)+'</span>';
//if(r.exc)alert(r.exc);
}
}
@ -53,4 +53,4 @@ pscript.show_forgot_password = function(){
}
d.show();
pscript.forgot_dialog = d;
}
}

10
py/webnotes/auth.py
View file

@ -137,10 +137,9 @@ class LoginManager:
def authenticate(self, user=None, pwd=None):
if not (user and pwd):
user, pwd = webnotes.form_dict.get('usr'), webnotes.form_dict.get('pwd')
if not (user and pwd):
webnotes.msgprint('Incomplete Login Details', raise_exception=1)
webnotes.response['message'] = 'Incomplete Login Details'
raise Exception
# custom authentication (for single-sign on)
self.load_control_panel()
if hasattr(self.cp, 'authenticate'):
@ -151,9 +150,10 @@ class LoginManager:
p = webnotes.conn.sql("select name from tabProfile where name=%s and (`password`=%s OR `password`=PASSWORD(%s))", (user, pwd, pwd))
else:
p = webnotes.conn.sql("select name from tabProfile where name=%s and (`password`=%s OR `password`=PASSWORD(%s)) and IFNULL(enabled,0)=1", (user, pwd, pwd))
if not p:
webnotes.msgprint('Authentication Failed', raise_exception=1)
webnotes.response['message'] = 'Authentication Failed'
raise Exception
#webnotes.msgprint('Authentication Failed',raise_exception=1)
self.user = p[0][0]