accurator/commit

Errorless user check!

authorChris Dijkshoorn
Wed Mar 16 13:59:26 2016 +0100
committerChris Dijkshoorn
Wed Mar 16 13:59:26 2016 +0100
commite880fbec7bc50cc591fe6dd666ce9703acfa98ea
tree953861e8bb2ab5d838c3cc6bdf225b481e42718a
parent7ad78071b6469dae68ed15d611774fe7bc8e12a8
Diff style: patch stat
diff --git a/lib/accurator/accurator_user.pl b/lib/accurator/accurator_user.pl
index 05b2d24..ce895bc 100644
--- a/lib/accurator/accurator_user.pl
+++ b/lib/accurator/accurator_user.pl
@@ -60,9 +60,11 @@ register_user(Request) :-
 %
 %	Get the id of a user.
 get_user(_Request) :-
-	logged_on(User),
+	logged_on(User), !,
 	user_property(User, realname(RealName)),
-	reply_json_dict(user{user:User, real_name:RealName}).
+	reply_json_dict(user{login:true, user:User, real_name:RealName}).
+get_user(_Request) :-
+	reply_json_dict(user{login:false}).
 
 %%	get_user_settings(+Request)
 %
diff --git a/web/js/accurator_utilities.js b/web/js/accurator_utilities.js
index b36c8c4..7495629 100644
--- a/web/js/accurator_utilities.js
+++ b/web/js/accurator_utilities.js
@@ -402,8 +402,10 @@ User management code.
 function userLoggedIn(onLoggedIn, onNotLoggedIn) {
 	//see if user is logged in (random for unique request)
 	$.getJSON("get_user?time=" + Math.random())
-		.done(onLoggedIn)
-		.fail(onNotLoggedIn);
+	.then(function(user) {
+		if (user.login) onLoggedIn();
+		if (!user.login) onNotLoggedIn();
+	});
 }
 
 function logUserIn(onLoggedIn, onDismissal) {