garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

rename users to user as it makes more sense

Browse Source
This commit is contained in:
Athou
2013-04-18 09:32:32 +02:00
parent 8d04a7c29f
commit 9bd825d786
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/commafeed/frontend/rest/resources/AdminREST.java
View File

@@ -33,7 +33,7 @@ import com.wordnik.swagger.annotations.ApiParam;
@Api(value = "/admin", description = "Operations about application administration") @Api(value = "/admin", description = "Operations about application administration")
public class AdminREST extends AbstractResourceREST { public class AdminREST extends AbstractResourceREST {
@Path("/users/save") @Path("/user/save")
@POST @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") @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) { public Response save(@ApiParam(required = true) UserModel userModel) {
@@ -92,7 +92,7 @@ public class AdminREST extends AbstractResourceREST {
} }
@Path("/users/get") @Path("/user/get")
@GET @GET
@ApiOperation(value = "Get user information", notes = "Get user information", responseClass = "com.commafeed.frontend.model.UserModel") @ApiOperation(value = "Get user information", notes = "Get user information", responseClass = "com.commafeed.frontend.model.UserModel")
public UserModel getUser( public UserModel getUser(
@@ -111,7 +111,7 @@ public class AdminREST extends AbstractResourceREST {
return userModel; return userModel;
} }
@Path("/users/getAll") @Path("/user/getAll")
@GET @GET
@ApiOperation(value = "Get all users", notes = "Get all users", responseClass = "List[com.commafeed.frontend.model.UserModel]") @ApiOperation(value = "Get all users", notes = "Get all users", responseClass = "List[com.commafeed.frontend.model.UserModel]")
public Collection<UserModel> getUsers() { public Collection<UserModel> getUsers() {
@@ -134,7 +134,7 @@ public class AdminREST extends AbstractResourceREST {
return users.values(); return users.values();
} }
@Path("/users/delete") @Path("/user/delete")
@POST @POST
@ApiOperation(value = "Delete a user", notes = "Delete a user, and all his subscriptions") @ApiOperation(value = "Delete a user", notes = "Delete a user, and all his subscriptions")
public Response delete( public Response delete(

2
src/main/webapp/js/services.js
View File

@@ -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; return res;
}); });