Some bug fixing of client migration
This commit is contained in:
parent
e5f12ae4c0
commit
eafca5d77a
5 changed files with 33 additions and 8 deletions
|
|
@ -20,7 +20,7 @@ $(function() {
|
|||
url: pluginUrl,
|
||||
dependency_links: !!dependencyLinks
|
||||
};
|
||||
return OctoPrint.simpleApiCommand(plugin, "install", data, opts);
|
||||
return OctoPrint.simpleApiCommand("pluginmanager", "install", data, opts);
|
||||
};
|
||||
|
||||
exports.reinstall = function(plugin, pluginUrl, dependencyLinks, opts) {
|
||||
|
|
@ -30,28 +30,28 @@ $(function() {
|
|||
reinstall: plugin,
|
||||
force: true
|
||||
};
|
||||
return OctoPrint.simpleApiCommand(plugin, "install", data, opts);
|
||||
return OctoPrint.simpleApiCommand("pluginmanager", "install", data, opts);
|
||||
};
|
||||
|
||||
exports.uninstall = function(plugin, opts) {
|
||||
var data = {
|
||||
plugin: plugin
|
||||
};
|
||||
return OctoPrint.simpleApiCommand(plugin, "uninstall", data, opts);
|
||||
return OctoPrint.simpleApiCommand("pluginmanager", "uninstall", data, opts);
|
||||
};
|
||||
|
||||
exports.enable = function(plugin, opts) {
|
||||
var data = {
|
||||
plugin: plugin
|
||||
};
|
||||
return OctoPrint.simpleApiCommand(plugin, "enable", data, opts);
|
||||
return OctoPrint.simpleApiCommand("pluginmanager", "enable", data, opts);
|
||||
};
|
||||
|
||||
exports.disable = function(plugin, opts) {
|
||||
var data = {
|
||||
plugin: plugin
|
||||
};
|
||||
return OctoPrint.simpleApiCommand(plugin, "disable", data, opts);
|
||||
return OctoPrint.simpleApiCommand("pluginmanager", "disable", data, opts);
|
||||
};
|
||||
|
||||
exports.upload = function(file) {
|
||||
|
|
|
|||
|
|
@ -913,7 +913,7 @@ class Server(object):
|
|||
"js/lib/sockjs-0.3.4.min.js"
|
||||
]
|
||||
js_client = [
|
||||
"js/app/client/octoprint.js",
|
||||
"js/app/client/base.js",
|
||||
"js/app/client/socket.js",
|
||||
"js/app/client/browser.js",
|
||||
"js/app/client/connection.js",
|
||||
|
|
|
|||
|
|
@ -185,8 +185,13 @@ def apiVersion():
|
|||
@admin_permission.require(403)
|
||||
def performSystemAction():
|
||||
logger = logging.getLogger(__name__)
|
||||
if "action" in request.values.keys():
|
||||
action = request.values["action"]
|
||||
|
||||
data = request.values
|
||||
if hasattr(request, "json") and request.json:
|
||||
data = request.json
|
||||
|
||||
if "action" in data:
|
||||
action = data["action"]
|
||||
available_actions = s().get(["system", "actions"])
|
||||
for availableAction in available_actions:
|
||||
if availableAction["action"] == action:
|
||||
|
|
|
|||
|
|
@ -12,5 +12,25 @@ OctoPrint.settings = (function($, _) {
|
|||
return OctoPrint.postJson(url, settings, opts);
|
||||
};
|
||||
|
||||
exports.getPluginSettings = function(plugin, opts) {
|
||||
return exports.get(opts)
|
||||
.then(function(settings, statusText, request) {
|
||||
if (!settings.plugins || !settings.plugins[plugin]) {
|
||||
return $.Deferred()
|
||||
.reject(request, "dataerror", "No settings for plugin " + plugin)
|
||||
.promise();
|
||||
} else {
|
||||
return settings.plugins[plugin];
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
exports.savePluginSettings = function(plugin, settings, opts) {
|
||||
var data = {};
|
||||
data["plugins"] = {};
|
||||
data["plugins"][plugin] = settings;
|
||||
return exports.save(data, opts);
|
||||
};
|
||||
|
||||
return exports;
|
||||
})($, _);
|
||||
|
|
|
|||
Loading…
Reference in a new issue