pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wizard also uses new confirmation dialog parameter format

Browse source
This commit is contained in:
Gina Häußge 2015-08-17 16:42:30 +02:00
parent 18c0dc6bf8
commit f4bcbd7c7b
1 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/octoprint/static/js/app/viewmodels/firstrun_wizard.js
View file

@ -39,11 +39,14 @@ $(function() {
self.disableAccessControl = function() {
var message = gettext("If you disable Access Control <strong>and</strong> your OctoPrint installation is accessible from the internet, your printer <strong>will be accessible by everyone - that also includes the bad guys!</strong>");
showConfirmationDialog(message, function(e) {
var data = {
"ac": false
};
self._sendData(data);
showConfirmationDialog({
message: message,
onproceed: function (e) {
var data = {
"ac": false
};
self._sendData(data);
}
});
};
@ -65,7 +68,10 @@ $(function() {
if (!current || !_.startsWith(current, "wizard_firstrun_acl") || self.setup()) {
return true;
}
showMessageDialog(gettext("You haven't yet set up access control. You need to either setup a username and password and click \"Keep Access Control Enabled\" or click \"Disable Access Control\" before continuing"), {title: "Please set up Access Control"});
showMessageDialog({
title: gettext("Please set up Access Control"),
message: gettext("You haven't yet set up access control. You need to either setup a username and password and click \"Keep Access Control Enabled\" or click \"Disable Access Control\" before continuing")
});
return false;
};
@ -76,9 +82,19 @@ $(function() {
};
}
function WebcamWizardViewModel(parameters) {
var self = this;
self.settingsViewModel = parameters[0];
}
OCTOPRINT_VIEWMODELS.push([
AclWizardViewModel,
[],
"#wizard_firstrun_acl"
], [
WebcamWizardViewModel,
["settingsViewModel"],
"#wizard_firstrun_webcam"
]);
});