From a2314a9ab397b42649d768aff725c0ff00cccd80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= Date: Fri, 5 Dec 2014 11:52:27 +0100 Subject: [PATCH] Fixed URL endpoint for printer profile API, it's supposed to be "api/printerprofiles", not "api/printerProfiles" --- src/octoprint/server/api/printer_profiles.py | 10 +++++----- .../static/js/app/viewmodels/printerprofiles.js | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/octoprint/server/api/printer_profiles.py b/src/octoprint/server/api/printer_profiles.py index 2984f3aa..d7b80112 100644 --- a/src/octoprint/server/api/printer_profiles.py +++ b/src/octoprint/server/api/printer_profiles.py @@ -17,12 +17,12 @@ from octoprint.util import dict_merge from octoprint.server import printerProfileManager -@api.route("/printerProfiles", methods=["GET"]) +@api.route("/printerprofiles", methods=["GET"]) def printerProfilesList(): all_profiles = printerProfileManager.get_all() return jsonify(dict(profiles=_convert_profiles(all_profiles))) -@api.route("/printerProfiles", methods=["POST"]) +@api.route("/printerprofiles", methods=["POST"]) @restricted_access def printerProfilesAdd(): if not "application/json" in request.headers["Content-Type"]: @@ -48,20 +48,20 @@ def printerProfilesAdd(): return _overwrite_profile(profile) -@api.route("/printerProfiles/", methods=["GET"]) +@api.route("/printerprofiles/", methods=["GET"]) def printerProfilesGet(identifier): profile = printerProfileManager.get(identifier) if profile is None: make_response("Unknown profile: %s" % identifier, 404) return jsonify(_convert_profile(profile)) -@api.route("/printerProfiles/", methods=["DELETE"]) +@api.route("/printerprofiles/", methods=["DELETE"]) @restricted_access def printerProfilesDelete(identifier): printerProfileManager.remove(identifier) return NO_CONTENT -@api.route("/printerProfiles/", methods=["PATCH"]) +@api.route("/printerprofiles/", methods=["PATCH"]) @restricted_access def printerProfilesUpdate(identifier): if not "application/json" in request.headers["Content-Type"]: diff --git a/src/octoprint/static/js/app/viewmodels/printerprofiles.js b/src/octoprint/static/js/app/viewmodels/printerprofiles.js index 5d2e4ee5..7b33d0a9 100644 --- a/src/octoprint/static/js/app/viewmodels/printerprofiles.js +++ b/src/octoprint/static/js/app/viewmodels/printerprofiles.js @@ -120,7 +120,7 @@ function PrinterProfilesViewModel() { self.requestData = function() { $.ajax({ - url: API_BASEURL + "printerProfiles", + url: API_BASEURL + "printerprofiles", type: "GET", dataType: "json", success: self.fromResponse @@ -153,7 +153,7 @@ function PrinterProfilesViewModel() { self.addProfile = function(callback) { var profile = self._editorData(); $.ajax({ - url: API_BASEURL + "printerProfiles", + url: API_BASEURL + "printerprofiles", type: "POST", dataType: "json", contentType: "application/json; charset=UTF-8", @@ -182,7 +182,7 @@ function PrinterProfilesViewModel() { } $.ajax({ - url: API_BASEURL + "printerProfiles/" + profile.id, + url: API_BASEURL + "printerprofiles/" + profile.id, type: "PATCH", dataType: "json", contentType: "application/json; charset=UTF-8",