Skip to content

Commit 0e3c4e8

Browse files
authored
Add enabled key to GET /trees (#497)
1 parent 38a4fc1 commit 0e3c4e8

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

gramps_webapi/api/resources/trees.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@
2929
from webargs import fields
3030
from werkzeug.security import safe_join
3131

32-
from ...auth import disable_enable_tree, get_tree_usage, set_tree_quota
32+
from ...auth import (
33+
disable_enable_tree,
34+
get_tree_usage,
35+
is_tree_disabled,
36+
set_tree_quota,
37+
)
3338
from ...auth.const import (
3439
PERM_ADD_TREE,
3540
PERM_DISABLE_TREE,
@@ -68,7 +73,8 @@ def get_tree_details(tree_id: str) -> Dict[str, str]:
6873
except ValueError:
6974
abort(404)
7075
usage = get_tree_usage(tree_id) or {}
71-
return {"name": dbmgr.name, "id": tree_id, **usage}
76+
enabled = not is_tree_disabled(tree=tree_id)
77+
return {"name": dbmgr.name, "id": tree_id, **usage, "enabled": enabled}
7278

7379

7480
def get_tree_path(tree_id: str) -> Optional[str]:

gramps_webapi/data/apispec.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10589,3 +10589,7 @@ definitions:
1058910589
description: "The current number of people."
1059010590
type: integer
1059110591
example: 96
10592+
enabled:
10593+
description: "Whether the tree is enabled."
10594+
type: boolean
10595+
example: true

tests/test_endpoints/test_trees.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def test_list_trees_owner(self):
9595
assert rv.status_code == 200
9696
trees = rv.json
9797
# owner can see only one tree
98-
assert trees == [{"id": self.tree, "name": self.name}]
98+
assert trees == [{"id": self.tree, "name": self.name, "enabled": True}]
9999

100100
def test_get_tree(self):
101101
rv = self.client.post(
@@ -126,7 +126,7 @@ def test_get_tree(self):
126126
headers={"Authorization": f"Bearer {token}"},
127127
)
128128
assert rv.status_code == 200
129-
assert rv.json == {"name": self.name, "id": self.tree}
129+
assert rv.json == {"name": self.name, "id": self.tree, "enabled": True}
130130

131131
def test_post_tree(self):
132132
rv = self.client.post(
@@ -162,6 +162,7 @@ def test_post_tree(self):
162162
assert rv.json["name"] == "some name"
163163
assert rv.json["quota_media"] == 1000000
164164
assert rv.json["quota_people"] is None
165+
assert rv.json["enabled"]
165166

166167
def test_rename_tree(self):
167168
rv = self.client.post(

0 commit comments

Comments
 (0)