q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Missed the settings when changing api -> allow to api -> enabled

master
Gina Häußge 2013-06-24 17:48:13 +02:00
parent 6989613b99
commit bd61d45e27
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octoprint/server.py
View File

@ -470,7 +470,7 @@ def getSettings():
return jsonify({ return jsonify({
"api": { "api": {
"allow": s.getBoolean(["api", "allow"]), "enabled": s.getBoolean(["api", "enabled"]),
"key": s.get(["api", "key"]) "key": s.get(["api", "key"])
}, },
"appearance": { "appearance": {
@ -523,7 +523,7 @@ def setSettings():
s = settings() s = settings()
if "api" in data.keys(): if "api" in data.keys():
if "allow" in data["api"].keys(): s.set(["api", "allow"], data["api"]["allow"]) if "enabled" in data["api"].keys(): s.set(["api", "enabled"], data["api"]["enabled"])
if "key" in data["api"].keys(): s.set(["api", "key"], data["api"]["key"], True) if "key" in data["api"].keys(): s.set(["api", "key"], data["api"]["key"], True)
if "appearance" in data.keys(): if "appearance" in data.keys():

8
octoprint/static/js/ui.js
View File

@ -1310,7 +1310,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.loginState = loginStateViewModel; self.loginState = loginStateViewModel;
self.users = usersViewModel; self.users = usersViewModel;
self.api_allow = ko.observable(undefined); self.api_enabled = ko.observable(undefined);
self.api_key = ko.observable(undefined); self.api_key = ko.observable(undefined);
self.appearance_name = ko.observable(undefined); self.appearance_name = ko.observable(undefined);
@ -1365,8 +1365,8 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
} }
self.fromResponse = function(response) { self.fromResponse = function(response) {
self.api_allow(response.api.allow); self.api_enabled(response.api.enabled);
self.api_key(response.api.key); self.api_key(response.api.key);
self.appearance_name(response.appearance.name); self.appearance_name(response.appearance.name);
self.appearance_color(response.appearance.color); self.appearance_color(response.appearance.color);
@ -1403,7 +1403,7 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) {
self.saveData = function() { self.saveData = function() {
var data = { var data = {
"api" : { "api" : {
"allow": self.api_allow(), "enabled": self.api_enabled(),
"key": self.api_key() "key": self.api_key()
}, },
"appearance" : { "appearance" : {

4
octoprint/templates/settings.jinja2
View File

@ -224,12 +224,12 @@
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox" id="settings-apiallow" data-bind="checked: api_allow"> Allow <input type="checkbox" id="settings-apiEnabled" data-bind="checked: api_enabled"> Enable
</label> </label>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<label class="control-label" for="settings-apikey">Apikey</label> <label class="control-label" for="settings-apiKey">Apikey</label>
<div class="controls"> <div class="controls">
<input type="text" class="input-block-level" data-bind="value: api_key" id="settings-apikey"> <input type="text" class="input-block-level" data-bind="value: api_key" id="settings-apikey">
</div> </div>