Unverified Commit cfc31bcb authored by Nicola Soranzo's avatar Nicola Soranzo
Browse files

Merge branch 'release_23.2' into release_24.0

parents 03457dff 63b92e71
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class UsersController(BaseShedAPIController):
        value_mapper = {"id": trans.security.encode_id}
        return value_mapper

    @web.expose_api_anonymous
    @web.expose_api_anonymous_and_sessionless
    def index(self, trans, deleted=False, **kwd):
        """
        GET /api/users
@@ -67,7 +67,7 @@ class UsersController(BaseShedAPIController):
            user_dicts.append(user_dict)
        return user_dicts

    @web.expose_api_anonymous
    @web.expose_api_anonymous_and_sessionless
    def show(self, trans, id, **kwd):
        """
        GET /api/users/{encoded_user_id}