diff options
| author | Nejc Habjan <hab.nejc@gmail.com> | 2022-01-14 02:05:11 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-14 02:05:11 +0100 |
| commit | 2c62d91a67442b21ce3011a2ba5aec7360ca766f (patch) | |
| tree | 3342749ce73ecc1c1375d7399e0e2a066562133f | |
| parent | 34110ddf4022340b238ecd964903bf7a6d729e38 (diff) | |
| parent | 75758bf26bca286ec57d5cef2808560c395ff7ec (diff) | |
| download | gitlab-2c62d91a67442b21ce3011a2ba5aec7360ca766f.tar.gz | |
Merge pull request #1836 from python-gitlab/jlvillal/id_to_encodedid
chore(objects): use `self.encoded_id` where applicable
| -rw-r--r-- | gitlab/v4/objects/todos.py | 2 | ||||
| -rw-r--r-- | gitlab/v4/objects/users.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/gitlab/v4/objects/todos.py b/gitlab/v4/objects/todos.py index e441eff..8bfef09 100644 --- a/gitlab/v4/objects/todos.py +++ b/gitlab/v4/objects/todos.py @@ -27,7 +27,7 @@ class Todo(ObjectDeleteMixin, RESTObject): Returns: A dict with the result """ - path = f"{self.manager.path}/{self.id}/mark_as_done" + path = f"{self.manager.path}/{self.encoded_id}/mark_as_done" server_data = self.manager.gitlab.http_post(path, **kwargs) if TYPE_CHECKING: assert isinstance(server_data, dict) diff --git a/gitlab/v4/objects/users.py b/gitlab/v4/objects/users.py index 53376a9..f5b8f6c 100644 --- a/gitlab/v4/objects/users.py +++ b/gitlab/v4/objects/users.py @@ -179,7 +179,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: Whether the user status has been changed """ - path = f"/users/{self.id}/block" + path = f"/users/{self.encoded_id}/block" server_data = self.manager.gitlab.http_post(path, **kwargs) if server_data is True: self._attrs["state"] = "blocked" @@ -200,7 +200,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: The new object data (*not* a RESTObject) """ - path = f"/users/{self.id}/follow" + path = f"/users/{self.encoded_id}/follow" return self.manager.gitlab.http_post(path, **kwargs) @cli.register_custom_action("User") @@ -218,7 +218,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: The new object data (*not* a RESTObject) """ - path = f"/users/{self.id}/unfollow" + path = f"/users/{self.encoded_id}/unfollow" return self.manager.gitlab.http_post(path, **kwargs) @cli.register_custom_action("User") @@ -236,7 +236,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: Whether the user status has been changed """ - path = f"/users/{self.id}/unblock" + path = f"/users/{self.encoded_id}/unblock" server_data = self.manager.gitlab.http_post(path, **kwargs) if server_data is True: self._attrs["state"] = "active" @@ -257,7 +257,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: Whether the user status has been changed """ - path = f"/users/{self.id}/deactivate" + path = f"/users/{self.encoded_id}/deactivate" server_data = self.manager.gitlab.http_post(path, **kwargs) if server_data: self._attrs["state"] = "deactivated" @@ -278,7 +278,7 @@ class User(SaveMixin, ObjectDeleteMixin, RESTObject): Returns: Whether the user status has been changed """ - path = f"/users/{self.id}/activate" + path = f"/users/{self.encoded_id}/activate" server_data = self.manager.gitlab.http_post(path, **kwargs) if server_data: self._attrs["state"] = "active" |