From 9bd825d7861afb7334acb3a4f0b2f8c234576d29 Mon Sep 17 00:00:00 2001
From: Athou <jeremiepanzer@gmail.com>
Date: Thu, 18 Apr 2013 09:32:32 +0200
Subject: [PATCH] rename users to user as it makes more sense

---
 .../com/commafeed/frontend/rest/resources/AdminREST.java  | 8 ++++----
 src/main/webapp/js/services.js                            | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
index 664c6f6d..06950ef6 100644
--- a/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
+++ b/src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
@@ -33,7 +33,7 @@ import com.wordnik.swagger.annotations.ApiParam;
 @Api(value = "/admin", description = "Operations about application administration")
 public class AdminREST extends AbstractResourceREST {
 
-	@Path("/users/save")
+	@Path("/user/save")
 	@POST
 	@ApiOperation(value = "Manually save or update a user", notes = "Manually save or update a user. If the id is not specified, a new user will be created")
 	public Response save(@ApiParam(required = true) UserModel userModel) {
@@ -92,7 +92,7 @@ public class AdminREST extends AbstractResourceREST {
 
 	}
 
-	@Path("/users/get")
+	@Path("/user/get")
 	@GET
 	@ApiOperation(value = "Get user information", notes = "Get user information", responseClass = "com.commafeed.frontend.model.UserModel")
 	public UserModel getUser(
@@ -111,7 +111,7 @@ public class AdminREST extends AbstractResourceREST {
 		return userModel;
 	}
 
-	@Path("/users/getAll")
+	@Path("/user/getAll")
 	@GET
 	@ApiOperation(value = "Get all users", notes = "Get all users", responseClass = "List[com.commafeed.frontend.model.UserModel]")
 	public Collection<UserModel> getUsers() {
@@ -134,7 +134,7 @@ public class AdminREST extends AbstractResourceREST {
 		return users.values();
 	}
 
-	@Path("/users/delete")
+	@Path("/user/delete")
 	@POST
 	@ApiOperation(value = "Delete a user", notes = "Delete a user, and all his subscriptions")
 	public Response delete(
diff --git a/src/main/webapp/js/services.js b/src/main/webapp/js/services.js
index 77984f0d..609c652e 100644
--- a/src/main/webapp/js/services.js
+++ b/src/main/webapp/js/services.js
@@ -228,7 +228,7 @@ module.factory('AdminUsersService', function($resource) {
 			}
 		}
 	};
-	var res = $resource('rest/admin/users/:_method', {}, actions);
+	var res = $resource('rest/admin/user/:_method', {}, actions);
 	return res;
 });