Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Entity row values to links" #235

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Revert "Entity row values to links" #235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions application/core/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from application.data_access.entity_queries import get_entity_query, get_entity_search
from application.data_access.entity_queries import get_entity_query
from application.core.utils import NoneToEmptyStringEncoder
from jinja2 import pass_eval_context
from markdown import markdown
Expand Down Expand Up @@ -174,30 +174,6 @@ def get_entity_name_filter(eval_ctx, entity):
return entity.reference


@pass_eval_context
def lookup_entity_filter(eval_ctx, value, dataset):
"lookup an entity by its name or reference"
search_parameters = {
"reference": [value],
"dataset": [dataset],
}
params, count, entities = get_entity_search(search_parameters).values()

if len(entities) == 1:
return entities[0].entity


@pass_eval_context
def lookup_entity_custom_filter(eval_ctx, value, dataset):

datasetMapping = {"permitted-development-rights": "permitted-development-right"}

if dataset in datasetMapping:
dataset = datasetMapping[dataset]

return lookup_entity_filter(eval_ctx, value, dataset)


def get_entity_name(entity):
if entity.name:
return entity.name
Expand Down
3 changes: 1 addition & 2 deletions application/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,7 @@ class DatasetPublicationCountModel(DigitalLandBaseModel):

def entity_factory(entity_orm: EntityOrm):
e = EntityModel.from_orm(entity_orm)

if hasattr(entity_orm, "json") and entity_orm.json is not None:
if entity_orm.json is not None:
# if values in json present then extend the pydantic model
# TODO could add in additional validation using field informtion
field_definitions = {
Expand Down
4 changes: 0 additions & 4 deletions application/core/templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@
render_markdown,
entity_name_filter,
get_entity_name_filter,
lookup_entity_filter,
lookup_entity_custom_filter,
debug,
digital_land_to_json,
uri_encode,
Expand Down Expand Up @@ -75,8 +73,6 @@ def random_int(n=1):
templates.env.filters["render_markdown"] = render_markdown
templates.env.filters["entity_name"] = entity_name_filter
templates.env.filters["get_entity_name"] = get_entity_name_filter
templates.env.filters["lookup_entity"] = lookup_entity_filter
templates.env.filters["lookup_entity_custom"] = lookup_entity_custom_filter
templates.env.filters["debug"] = debug
templates.env.filters["digital_land_to_json"] = digital_land_to_json
templates.env.filters["uri_encode"] = uri_encode
Expand Down
2 changes: 0 additions & 2 deletions application/templates/components/entity-value/macro.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@
{{ value }}
{% endif %}
</a>
{%- elif field in ["article-4-direction", "permitted-development-rights", "tree-preservation-order"] %}
<a class ="govuk-link" href="/entity/{{ value | lookup_entity_custom(field) }}">{{ value }}</a>
{%- elif field in ["parliament-thesaurus"] %}
<a class ="govuk-link" href="{{ 'https://lda.data.parliament.uk/terms/' + value }}">{{ value }}</a>
{%- elif field in ["statistical-geography"] %}
Expand Down
Loading