klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-15 02:33:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert the whole request to json at once on select widget

Browse Source
This commit is contained in:
Antoine Bartuccio 2024-10-21 17:11:07 +02:00
parent 3eb3feea49
commit e583e78a4e
3 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/static/webpack/core/components/ajax-select-base.ts
View File

@ -165,9 +165,8 @@ export abstract class AjaxSelect extends AutoCompleteSelectBase {
connectedCallback() {
/* Capture initial values before they get moved to the inner node and overridden by tom-select */
this.initialValues = Array.from(this.children)
.filter((child: Element) => child.tagName.toLowerCase() === "slot")
.map((slot) => JSON.parse(slot.innerHTML));
const initial = this.querySelector("slot[name='initial']")?.textContent;
this.initialValues = initial ? JSON.parse(initial) : [];
super.connectedCallback();
}

2
core/templates/core/widgets/autocomplete_select.jinja
View File

@ -9,5 +9,5 @@
<optgroup label="{{ group_name }}">{% endif %}{% for widget in group_choices %}
{% include widget.template_name %}{% endfor %}{% if group_name %}
</optgroup>{% endif %}{% endfor %}
{% for sel in selected %}<slot style="display: none">{{ sel }}</slot>{% endfor %}
{% if initial %}<slot style="display:none" name="initial">{{ initial }}</slot>{% endif %}
</{{ component }}>

11
core/views/widgets/select.py
View File

@ -2,6 +2,7 @@ from django.contrib.staticfiles.storage import staticfiles_storage
from django.db.models import Model
from django.forms import Select, SelectMultiple
from ninja import ModelSchema
from pydantic import TypeAdapter
from core.models import Group, SithFile, User
from core.schemas import GroupSchema, SithFileSchema, UserProfileSchema
@ -46,9 +47,10 @@ class AutoCompleteSelectMixin:
"css": [staticfiles_storage.url(file) for file in self.css],
}
if self.is_ajax:
context["selected"] = [
self.schema.from_orm(obj).model_dump_json()
for obj in self.model.objects.filter(
adapter = TypeAdapter(list[self.schema])
context["initial"] = adapter.dump_json(
adapter.validate_python(
self.model.objects.filter(
**{
f"{self.pk}__in": [
pk
@ -59,7 +61,8 @@ class AutoCompleteSelectMixin:
]
}
).all()
]
)
).decode("utf-8")
return context