From c51c45b46d9e0a06059e8ba0b3b100e456c89b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Wed, 18 Mar 2015 16:37:23 +0100
Subject: [PATCH] Better handling of callbacks for /api/users/... calls

---
 .../static/js/app/viewmodels/users.js         | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/octoprint/static/js/app/viewmodels/users.js b/src/octoprint/static/js/app/viewmodels/users.js
index eae49bc1..b1d14dc1 100644
--- a/src/octoprint/static/js/app/viewmodels/users.js
+++ b/src/octoprint/static/js/app/viewmodels/users.js
@@ -178,7 +178,9 @@ $(function() {
                 data: JSON.stringify(user),
                 success: function(response) {
                     self.fromResponse(response);
-                    callback();
+                    if (callback) {
+                        callback(response);
+                    }
                 }
             });
         };
@@ -198,7 +200,9 @@ $(function() {
                 type: "DELETE",
                 success: function(response) {
                     self.fromResponse(response);
-                    callback();
+                    if (callback) {
+                        callback(response);
+                    }
                 }
             });
         };
@@ -214,7 +218,9 @@ $(function() {
                 data: JSON.stringify(user),
                 success: function(response) {
                     self.fromResponse(response);
-                    callback();
+                    if (callback) {
+                        callback(response);
+                    }
                 }
             });
         };
@@ -227,7 +233,11 @@ $(function() {
                 type: "PUT",
                 contentType: "application/json; charset=UTF-8",
                 data: JSON.stringify({password: password}),
-                success: callback
+                success: function(response) {
+                    if (callback) {
+                        callback(response);
+                    }
+                }
             });
         };
 
@@ -237,7 +247,11 @@ $(function() {
             $.ajax({
                 url: API_BASEURL + "users/" + username + "/apikey",
                 type: "POST",
-                success: callback
+                success: function(response) {
+                    if (callback) {
+                        callback(response);
+                    }
+                }
             });
         };
 
@@ -247,7 +261,11 @@ $(function() {
             $.ajax({
                 url: API_BASEURL + "users/" + username + "/apikey",
                 type: "DELETE",
-                success: callback
+                success: function(response) {
+                    if (callback) {
+                        callback(response);
+                    }
+                }
             });
         }
     }