diff --git a/webadmin/src/js/client.js b/webadmin/src/js/client.js index e3d92d22b..d2ce98669 100644 --- a/webadmin/src/js/client.js +++ b/webadmin/src/js/client.js @@ -164,6 +164,7 @@ angular.module('Application').service('Client', ['$http', 'md5', 'Notification', this._userInfo.email = userInfo.email; this._userInfo.displayName = userInfo.displayName; this._userInfo.admin = !!userInfo.admin; + this._userInfo.showTutorial = !!userInfo.showTutorial; this._userInfo.gravatar = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email.toLowerCase()) + '.jpg?s=24&d=mm'; this._userInfo.gravatarHuge = 'https://www.gravatar.com/avatar/' + md5.createHash(userInfo.email.toLowerCase()) + '.jpg?s=128&d=mm'; }; diff --git a/webadmin/src/js/main.js b/webadmin/src/js/main.js index 0e4e6ebf9..391616568 100644 --- a/webadmin/src/js/main.js +++ b/webadmin/src/js/main.js @@ -127,7 +127,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route', } - Client.refreshUserInfo(function (error, result) { + Client.refreshUserInfo(function (error) { if (error) return $scope.error(error); Client.refreshInstalledApps(function (error) { @@ -165,9 +165,7 @@ angular.module('Application').controller('MainController', ['$scope', '$route', } // welcome screen - // setTimeout(function () { - // $scope.nextWelcomeStep(); - // }, 1000); + if ($scope.user.showTutorial && $scope.user.admin) $scope.nextWelcomeStep(); }); }); });