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

Merge branch 'maintenance' into devel

Browse source 
Conflicts:
	src/octoprint/static/js/app/viewmodels/loginstate.js
This commit is contained in:
BillyBlaze 2016-04-30 10:42:57 +00:00
commit dd73a23940
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,11 @@ $(function() {
.done(function(response) {
new PNotify({title: gettext("Logout successful"), text: gettext("You are now logged out"), type: "success"});
self.fromResponse(response);
})
.error(function(error) {
if (error && error.status === 401) {
self.fromResponse(false);
}
});
};