Skip to content

Commit

Permalink
Integrate ID attribute for blocks and fields
Browse files Browse the repository at this point in the history
  • Loading branch information
Nigel2392 committed Apr 15, 2024
1 parent f1fe1fe commit 863210c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[metadata]
name = wagtail_fedit
version = 1.4.8a3
version = 1.4.8a4
description = Frontend editing for your Wagtail site
long_description = file: README.md
long_description_content_type = text/markdown
Expand Down
3 changes: 3 additions & 0 deletions wagtail_fedit/adapters/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ def check_permissions(self):
return False
return True

def get_element_id(self) -> str:
raise NotImplementedError

def get_form(self) -> "forms.Form":
raise NotImplementedError

Expand Down
3 changes: 3 additions & 0 deletions wagtail_fedit/adapters/block.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ def get_header_title(self):
"model_name": self.model._meta.verbose_name,
"model_string": model_string,
}

def get_element_id(self) -> str:
return f"block-{self.kwargs['block_id']}-section"

def get_form(self):

Expand Down
6 changes: 5 additions & 1 deletion wagtail_fedit/adapters/field.py
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,11 @@ def get_help_text(self):
}

return super().get_help_text()


def get_element_id(self) -> str:
m = self.model
return f"field-{self.field_name}-{m._meta.app_label}-{m._meta.model_name}-{self.object.pk}"

def get_form(self):
if self.request.method == "POST":
form = self.form_class(self.request.POST, request=self.request, instance=self.object)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="wagtail-fedit-adapter-wrapper{%if shared_context.inline%} wagtail-fedit-inline{%endif%} wagtail-fedit-{{ identifier }}"{% if shared %} data-shared-context="{{ shared }}"{%endif%} data-edit-url="{{ edit_url }}">
<div id="{{ adapter.get_element_id }}" class="wagtail-fedit-adapter-wrapper{%if shared_context.inline%} wagtail-fedit-inline{%endif%} wagtail-fedit-{{ identifier }}"{% if shared %} data-shared-context="{{ shared }}"{%endif%} data-edit-url="{{ edit_url }}">
<div class="wagtail-fedit-buttons">
{% for button in buttons %}
{{ button }}
Expand Down
2 changes: 0 additions & 2 deletions wagtail_fedit/templatetags/fedit.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,6 @@ def wrap_adapter(request: HttpRequest, adapter: BaseAdapter, context: dict) -> s

context["wagtail_fedit_field"] = adapter.field_name
context["wagtail_fedit_instance"] = adapter.object

context["request"] = request

content = adapter.render_content(context)
Expand All @@ -185,7 +184,6 @@ def wrap_adapter(request: HttpRequest, adapter: BaseAdapter, context: dict) -> s
return render_to_string(
"wagtail_fedit/content/editable_adapter.html",
{
"request": request,
"identifier": adapter.identifier,
"content": content,
"adapter": adapter,
Expand Down

0 comments on commit 863210c

Please sign in to comment.