Defer configure checks to after tutorial

Fixes #154
2017-01-09 13:44:59 +01:00
parent 6b55f3ae11
commit e3ea2323c5
1 changed files with 8 additions and 5 deletions
--- a/webadmin/src/js/main.js
+++ b/webadmin/src/js/main.js
@@ -26,6 +26,9 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
            if (error) console.error(error);

            window.location.href = '#/apps';
+
+            // now run configure checks which might show notifications
+            runConfigurationChecks();
        });
    };

@@ -193,11 +196,11 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
                        });
                    }

-                    // welcome screen
-                    if ($scope.user.showTutorial && $scope.user.admin) $scope.startTutorial();
-
-                    // configuration checks
-                    if ($scope.user.admin) runConfigurationChecks();
+                    if ($scope.user.admin) {
+                        // welcome screen or configure checks immediately
+                        if ($scope.user.showTutorial) $scope.startTutorial();
+                        else runConfigurationChecks();
+                    }
                });
            });
        });