projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
Pman.Login.js
diff --git
a/Pman.Login.js
b/Pman.Login.js
index
e983845
..
a7b77e2
100644
(file)
--- a/
Pman.Login.js
+++ b/
Pman.Login.js
@@
-69,7
+69,7
@@
Pman.Login = new Roo.util.Observable({
if (!res.data.id) { // id=0 == login failure.
return this.show(true);
}
if (!res.data.id) { // id=0 == login failure.
return this.show(true);
}
- Roo.log(res);
+
//console.log(success);
this.fillAuth(res.data);
//console.log(success);
this.fillAuth(res.data);
@@
-132,7
+132,9
@@
Pman.Login = new Roo.util.Observable({
var res = Pman.processResponse(response);
//console.log(res);
if ( Pman.Login.checkFails > 2) {
var res = Pman.processResponse(response);
//console.log(res);
if ( Pman.Login.checkFails > 2) {
- Pman.Preview.disable();
+ if (typeof(Pman.Preview) != 'undefined') {
+ Pman.Preview.disable(); // not sure why this was added - but MO chrome does not have it.
+ }
Roo.MessageBox.alert("Error", res.errorMsg ? res.errorMsg :
"Error getting authentication status. - try reloading");
return;
Roo.MessageBox.alert("Error", res.errorMsg ? res.errorMsg :
"Error getting authentication status. - try reloading");
return;
@@
-259,15
+261,15
@@
Pman.Login = new Roo.util.Observable({
Roo.MessageBox.alert("Error", "Fill in your email address");
return;
}
Roo.MessageBox.alert("Error", "Fill in your email address");
return;
}
- Roo.Ajax.request({
- url: baseURL + '/Login.js',
+ new Pman.Request({
+ url: baseURL + '/Login.js',
+ mask : "Sending Password Reset email",
params: {
passwordRequest: n
},
method: 'POST',
params: {
passwordRequest: n
},
method: 'POST',
- success: function(res
ponse, opts
) { // check successfull...
+ success: function(res) { // check successfull...
- var res = Pman.processResponse(response);
if (!res.success) { // error!
Roo.MessageBox.alert("Error" , res.errorMsg ? res.errorMsg : "Problem Requesting Password Reset");
return;
if (!res.success) { // error!
Roo.MessageBox.alert("Error" , res.errorMsg ? res.errorMsg : "Problem Requesting Password Reset");
return;
@@
-348,9
+350,8
@@
Pman.Login = new Roo.util.Observable({
autoCreate : {tag: "input", type: "text", size: "20"}
}),
autoCreate : {tag: "input", type: "text", size: "20"}
}),
- new Roo.form.
TextFiel
d({
+ new Roo.form.
Passwor
d({
fieldLabel: "Password",
fieldLabel: "Password",
- inputType: 'password',
name: 'password',
width:200,
autoCreate : {tag: "input", type: "text", size: "20"},
name: 'password',
width:200,
autoCreate : {tag: "input", type: "text", size: "20"},
@@
-407,18
+408,22
@@
Pman.Login = new Roo.util.Observable({
ef.dom.style.margin = 10;
this.form.render(ef.dom);
ef.dom.style.margin = 10;
this.form.render(ef.dom);
- // logoprefix comes from base config.
+ // logoprefix comes from base config - normally the owner company logo...
+ // ???
var img = typeof(appLogo) != 'undefined' && appLogo.length ? appLogo :
rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' ;
var img = typeof(appLogo) != 'undefined' && appLogo.length ? appLogo :
rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' ;
- Pman.Login.form.el.createChild({
+
Pman.Login.form.el.createChild({
tag: 'img',
src: img,
style: 'margin-bottom: 10px;'
},
Pman.Login.form.el.dom.firstChild
tag: 'img',
src: img,
style: 'margin-bottom: 10px;'
},
Pman.Login.form.el.dom.firstChild
- );
+ ).on('error', function() {
+ this.dom.style.visibility = 'hidden';
+ this.dom.style.height = '10px';
+ });
var vp = this.dialog.getLayout().add('center', new Roo.ContentPanel(ef, {
autoCreate : true,
var vp = this.dialog.getLayout().add('center', new Roo.ContentPanel(ef, {
autoCreate : true,