Skip to content

Commit e988b6d

Browse files
Fix implementation
1 parent 8d48d00 commit e988b6d

File tree

3 files changed

+29
-30
lines changed

3 files changed

+29
-30
lines changed

src/country_workspace/workspaces/admin/hh_ind.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from admin_extra_buttons.decorators import button
44
from adminfilters.mixin import AdminAutoCompleteSearchMixin
55
from concurrency.utils import fqn
6-
from django import forms
76
from django.contrib import messages
87
from django.contrib.admin.utils import unquote
98
from django.core.exceptions import PermissionDenied
@@ -67,15 +66,6 @@ class BeneficiaryBaseAdmin(AdminAutoCompleteSearchMixin, SelectedProgramMixin, W
6766
list_per_page = 20
6867
object_history_template = "workspace/individual/object_history.html"
6968

70-
@property
71-
def media(self) -> forms.Media:
72-
return super().media + forms.Media(
73-
js=[
74-
"workspace/js/select-all.js",
75-
],
76-
css={},
77-
)
78-
7969
@property
8070
def title_group(self) -> str | None:
8171
return self._get_title_label("group_label")
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
$(function () {
22
$("#select-all").change(function () {
3-
$(this).parent("form").children("input:checkbox").not(this).prop('checked', this.checked);
3+
$(this)
4+
.closest("form")
5+
.find("input:checkbox")
6+
.not(this)
7+
.prop('checked', this.checked);
48
})
59
})
Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
{% extends "workspace/actions/base.html" %}{% load i18n %}
1+
{% extends "workspace/actions/base.html" %}{% load i18n static %}
22
{% block content %}
3-
<div>
4-
Select the columns you want to update
5-
</div>
6-
<form method="post" id="bulk-update-form">
7-
<div class="submit-row">
8-
<input type="submit" value="{% translate 'Export' %}" class="default" name="_export">
9-
</div>
10-
{% csrf_token %}
11-
<label for="select-all">
12-
<input type="checkbox" id="select-all">Select all
13-
</label>
14-
<table>
15-
{{ form.as_table }}
16-
</table>
17-
{% load admin_urls i18n workspace_urls %}
18-
<div class="submit-row float-right">
19-
<input type="submit" value="{% translate 'Export' %}" class="default" name="_export">
3+
<div>
4+
Select the columns you want to update
205
</div>
6+
<form method="post" id="bulk-update-form">
7+
<div class="submit-row">
8+
<input type="submit" value="{% translate 'Export' %}" class="default" name="_export">
9+
</div>
10+
{% csrf_token %}
11+
<label for="select-all">
12+
<input type="checkbox" id="select-all">Select all
13+
</label>
14+
<table>
15+
{{ form.as_table }}
16+
</table>
17+
{% load admin_urls i18n workspace_urls %}
18+
<div class="submit-row float-right">
19+
<input type="submit" value="{% translate 'Export' %}" class="default" name="_export">
20+
</div>
2121

22-
</form>
22+
</form>
23+
{% block admin_change_form_document_ready %}
24+
{% block document_ready %}
25+
<script src="{% static 'workspace/js/select-all.js' %}"></script>
26+
{% endblock document_ready %}
27+
{% endblock admin_change_form_document_ready %}
2328
{% endblock content %}

0 commit comments

Comments
 (0)