From 33cbd3dcbdb0bc49e2e59f4eb0156435f868f7b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Tue, 14 Jul 2015 20:21:31 +0200
Subject: [PATCH] Only show wizard when firstRun is true or user is admin

---
 .../static/js/app/viewmodels/wizard.js        | 148 ++++++++++--------
 1 file changed, 85 insertions(+), 63 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/wizard.js b/src/octoprint/static/js/app/viewmodels/wizard.js
index a32e9998..1fe81e03 100644
--- a/src/octoprint/static/js/app/viewmodels/wizard.js
+++ b/src/octoprint/static/js/app/viewmodels/wizard.js
@@ -1,10 +1,18 @@
 $(function() {
-    function WizardViewModel() {
+    function WizardViewModel(parameters) {
         var self = this;
 
+        self.loginState = parameters[0];
+
         self.wizardDialog = undefined;
 
+        self.isDialogActive = function() {
+            return self.wizardDialog.is(":visible");
+        };
+
         self.showDialog = function() {
+            if (!CONFIG_WIZARD || !(CONFIG_FIRST_RUN || self.loginState.isAdmin())) return;
+
             self.wizardDialog.modal({
                 minHeight: function() { return Math.max($.fn.modal.defaults.maxHeight() - 80, 250); }
             }).css({
@@ -21,74 +29,88 @@ $(function() {
             self.wizardDialog = $("#wizard_dialog");
         };
 
+        self.onUserLoggedIn = function() {
+            self.showDialog();
+        };
+
         self.onAllBound = function(allViewModels) {
-            if (CONFIG_WIZARD) {
-                self.wizardDialog.bootstrapWizard({
-                    tabClass: "nav nav-list",
-                    nextSelector: ".button-next",
-                    previousSelector: ".button-previous",
-                    finishSelector: ".button-finish",
-                    onTabClick: function() {
-                        // we don't allow clicking on the tabs
-                        return false;
-                    },
-                    onTabShow: function(tab, navigation, index) {
-                        if (index < 0 || tab.length == 0) {
-                            return true;
-                        }
-
-                        var total = self.wizardDialog.bootstrapWizard("navigationLength");
-
-                        if (index == total) {
-                            self.wizardDialog.find(".button-next").hide();
-                            self.wizardDialog.find(".button-finish").show().removeClass("disabled");
-                        } else {
-                            self.wizardDialog.find(".button-finish").hide();
-                            self.wizardDialog.find(".button-next").show();
-                        }
-
-                        var active = tab[0].id;
-                        if (active != undefined) {
-                            _.each(allViewModels, function(viewModel) {
-                                if (viewModel.hasOwnProperty("onAfterWizardTabChange")) {
-                                    viewModel.onAfterWizardTabChange(active);
-                                }
-                            });
-                        }
-                    },
-                    onTabChange: function(tab, navigation, index, nextTabIndex, nextTab) {
-                        var current, next;
-
-                        if (index == undefined || index < 0 ||
-                                nextTabIndex == undefined || nextTabIndex < 0 ||
-                                index == nextTabIndex ||
-                                tab.length == 0 || nextTab.length == 0) {
-                            // let's ignore that nonsense
-                            return;
-                        }
-
-                        current = tab[0].id;
-                        next = nextTab[0].id;
-
-                        if (current != undefined && next != undefined) {
-                            var result = true;
-                            _.each(allViewModels, function(viewModel) {
-                                if (viewModel.hasOwnProperty("onWizardTabChange")) {
-                                    result = result && viewModel.onWizardTabChange(current, next);
-                                }
-                            });
-                            return result;
-                        }
+            self.wizardDialog.bootstrapWizard({
+                tabClass: "nav nav-list",
+                nextSelector: ".button-next",
+                previousSelector: ".button-previous",
+                finishSelector: ".button-finish",
+                onTabClick: function() {
+                    // we don't allow clicking on the tabs
+                    return false;
+                },
+                onTabShow: function(tab, navigation, index) {
+                    if (index < 0 || tab.length == 0) {
+                        return true;
                     }
-                });
-                self.showDialog();
-            }
-        }
+
+                    var total = self.wizardDialog.bootstrapWizard("navigationLength");
+
+                    if (index == total) {
+                        self.wizardDialog.find(".button-next").hide();
+                        self.wizardDialog.find(".button-finish").show().removeClass("disabled");
+                    } else {
+                        self.wizardDialog.find(".button-finish").hide();
+                        self.wizardDialog.find(".button-next").show();
+                    }
+
+                    var active = tab[0].id;
+                    if (active != undefined) {
+                        _.each(allViewModels, function(viewModel) {
+                            if (viewModel.hasOwnProperty("onAfterWizardTabChange")) {
+                                viewModel.onAfterWizardTabChange(active);
+                            }
+                        });
+                    }
+                },
+                onTabChange: function(tab, navigation, index, nextTabIndex, nextTab) {
+                    var current, next;
+
+                    if (index == undefined || index < 0 ||
+                        nextTabIndex == undefined || nextTabIndex < 0 ||
+                        index == nextTabIndex ||
+                        tab.length == 0 || nextTab.length == 0) {
+                        // let's ignore that nonsense
+                        return;
+                    }
+
+                    current = tab[0].id;
+                    next = nextTab[0].id;
+
+                    if (current != undefined && next != undefined) {
+                        var result = true;
+                        _.each(allViewModels, function(viewModel) {
+                            if (viewModel.hasOwnProperty("onWizardTabChange")) {
+                                result = result && (viewModel.onWizardTabChange(current, next) !== false);
+                            }
+                        });
+                        return result;
+                    }
+                },
+                onFinish: function(tab, navigation, index) {
+                    var closeDialog = true;
+                    _.each(allViewModels, function(viewModel) {
+                        if (viewModel.hasOwnProperty("onWizardFinish")) {
+                            closeDialog = closeDialog && (viewModel.onWizardFinish() !== false);
+                        }
+                    });
+
+                    if (closeDialog) {
+                        self.closeDialog();
+                    }
+                }
+            });
+            self.showDialog();
+        };
     }
 
     OCTOPRINT_VIEWMODELS.push([
         WizardViewModel,
-        [],
+        ["loginStateViewModel"],
         "#wizard_dialog"
     ]);
 });