Skip to content

Commit

Permalink
Merge branch 'dev/8.0.x' of https://github.com/archesproject/arches i…
Browse files Browse the repository at this point in the history
…nto 11570-cbyrd-harden-editable_future_graphs-against-nodegroup-changes
  • Loading branch information
chrabyrd committed Nov 15, 2024
2 parents 723485d + a97cfb1 commit 8f589d1
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
14 changes: 14 additions & 0 deletions arches/app/datatypes/datatypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,13 @@ def append_to_document(self, document, nodevalue, nodeid, tile, provisional=Fals
"provisional": provisional,
}
)
document["strings"].append(
{
"string": str(nodevalue),
"nodegroup_id": tile.nodegroup_id,
"provisional": provisional,
}
)

def append_search_filters(self, value, node, query, request):
try:
Expand Down Expand Up @@ -572,6 +579,13 @@ def default_es_mapping(self):
mapping = {"type": "double"}
return mapping

def get_search_terms(self, nodevalue, nodeid=None):
terms = []
if nodevalue:
terms.append(SearchTerm(value=nodevalue))

return terms


class BooleanDataType(BaseDataType):
def validate(
Expand Down
1 change: 1 addition & 0 deletions releases/8.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Arches 8.0.0 Release Notes
- Make node aliases not nullable [#10437](https://github.com/archesproject/arches/issues/10437)
- Concepts API no longer responds with empty body for error conditions [#11519](https://github.com/archesproject/arches/issues/11519)
- Removes sample index from new projects, updates test coverage behavior [#11591](https://github.com/archesproject/arches/issues/11519)
- Make number datatype node values searchable in the main search [#11619](https://github.com/archesproject/arches/issues/11619)

### Dependency changes
```
Expand Down

0 comments on commit 8f589d1

Please sign in to comment.