Merge branch 'master' of https://github.com/inancsevinc/nodejslabs

bahaddinyasar · Mar 17, 2012 · 1c53d8f · 1c53d8f
2 parents c66933a + 927a90b
commit 1c53d8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/routes/api_jqgrid_users.js b/routes/api_jqgrid_users.js
@@ -43,7 +43,7 @@ module.exports = {
     apiJqgridUsersPost: function(req, res) {
         console.log(req.body);
         if (req.body.oper === 'del' ) {
-            api_users.delete(req, res);
+            api_users.deleteUser(req, res);
         }
         else if (req.body.oper === 'add'){
         	api_users.create(req, res);

diff --git a/routes/api_users.js b/routes/api_users.js
@@ -26,7 +26,7 @@ module.exports = {
 			"description":"update a given user",
 			"auth":false
 		},
-		"delete" : {
+		"deleteUser" : {
 			"url":"/api/users/:id", 
 			"method":"delete",
 			"description":"delete your own user, attention: cant be undone",
@@ -88,7 +88,7 @@ module.exports = {
 	}, 
 
     // DELETE /users/:id
-	delete: function(req, res) {
+	deleteUser: function(req, res) {
         var theId = req.params.id ? req.params.id : req.body.id;  
         users.removeById(theId, function(err) {
             if (err)  {