From 6edae27d2629822eefcbd3fbe5709fb0f599bac8 Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 25 Jan 2015 19:20:49 +0100 Subject: [PATCH] Fixes #3: Race condition on settings screen --- .../src/main/webapp/src/app/docs/controller/Settings.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Settings.js b/docs-web/src/main/webapp/src/app/docs/controller/Settings.js index 47823487..4a1f5748 100644 --- a/docs-web/src/main/webapp/src/app/docs/controller/Settings.js +++ b/docs-web/src/main/webapp/src/app/docs/controller/Settings.js @@ -3,7 +3,9 @@ /** * Settings controller. */ -angular.module('docs').controller('Settings', function($scope, Restangular) { +angular.module('docs').controller('Settings', function($scope, User) { // Flag if the user is admin - $scope.isAdmin = $scope.userInfo.base_functions.indexOf('ADMIN') != -1; + User.userInfo().then(function(data) { + $scope.isAdmin = data.base_functions.indexOf('ADMIN') != -1; + }) }); \ No newline at end of file