pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow programmatic login in the UI

Browse source
This commit is contained in:
Gina Häußge 2015-08-19 17:29:25 +02:00
parent c33fcdb124
commit b6b1bfd33b
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/octoprint/static/js/app/viewmodels/loginstate.js
View file

@ -66,10 +66,10 @@ $(function() {
}
};
self.login = function() {
var username = self.loginUser();
var password = self.loginPass();
var remember = self.loginRemember();
self.login = function(u, p, r, callback) {
var username = u || self.loginUser();
var password = p || self.loginPass();
var remember = (r != undefined ? r : self.loginRemember());
self.loginUser("");
self.loginPass("");
@ -82,6 +82,7 @@ $(function() {
success: function(response) {
new PNotify({title: gettext("Login successful"), text: _.sprintf(gettext('You are now logged in as "%(username)s"'), {username: response.name}), type: "success"});
self.fromResponse(response);
if (callback) callback(response);
},
error: function(jqXHR, textStatus, errorThrown) {
new PNotify({title: gettext("Login failed"), text: gettext("User unknown or wrong password"), type: "error"});