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

Don't call onUserLoggedIn/Out on user reload

Browse source
This commit is contained in:
Gina Häußge 2017-03-06 14:11:41 +01:00
parent 811c91955c
commit d8f2630fd4
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ $(function() {
}
OctoPrint.users.get(self.currentUser().name)
.done(self.fromResponse);
.done(self.updateCurrentUserData);
};
self.requestData = function() {
@ -52,25 +52,31 @@ $(function() {
self.fromResponse = function(response) {
if (response && response.name) {
self.loggedIn(true);
self.username(response.name);
self.isUser(response.user);
self.isAdmin(response.admin);
self.currentUser(response);
self.updateCurrentUserData(response);
callViewModels(self.allViewModels, "onUserLoggedIn", [response]);
} else {
self.loggedIn(false);
self.username(undefined);
self.isUser(false);
self.isAdmin(false);
self.currentUser(undefined);
self.resetCurrentUserData();
callViewModels(self.allViewModels, "onUserLoggedOut");
}
};
self.updateCurrentUserData = function(data) {
self.username(data.name);
self.isUser(data.user);
self.isAdmin(data.admin);
self.currentUser(data);
};
self.resetCurrentUserData = function() {
self.username(undefined);
self.isUser(false);
self.isAdmin(false);
self.currentUser(undefined);
};
self.login = function(u, p, r) {
var username = u || self.loginUser();
var password = p || self.loginPass();