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

Use tomselect #421

Closed
wants to merge 7 commits into from
Closed

Use tomselect #421

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bfce28
Use tomselect
frcroth Nov 9, 2023
770f739
Lint
frcroth Nov 9, 2023
a52204b
Merge branch 'upstream-main' into tomselect
frcroth Nov 14, 2023
94a46a1
Add user profile to get display name field for tomselect
frcroth Nov 21, 2023
49cabf4
Fix sth
frcroth Nov 21, 2023
afe4038
Fix tests
frcroth Nov 21, 2023
5dec7e2
Remove markdown.util.etree
frcroth Nov 21, 2023
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
15 changes: 4 additions & 11 deletions myhpi/core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from django.db import models
from django.db.models import BooleanField, CharField, DateField, ForeignKey, Model, Q
from django.http import HttpResponseRedirect
from django_select2 import forms as s2forms
from django_tomselect.widgets import TomSelectMultipleWidget, TomSelectWidget
from modelcluster.contrib.taggit import ClusterTaggableManager
from modelcluster.fields import ParentalKey, ParentalManyToManyField
from taggit.models import ItemBase, TagBase
Expand Down Expand Up @@ -170,13 +170,6 @@ def get_last_minutes(self):
return existing_minutes.last().specific


class UserSelectWidget(s2forms.ModelSelect2MultipleWidget):
search_fields = [
"username__icontains",
"email__icontains",
]


class Minutes(BasePage):
date = DateField()
moderator = ForeignKey(
Expand All @@ -193,9 +186,9 @@ class Minutes(BasePage):

content_panels = Page.content_panels + [
FieldPanel("date"),
FieldPanel("moderator"),
FieldPanel("author"),
FieldPanel("participants", widget=UserSelectWidget),
FieldPanel("moderator", widget=TomSelectWidget(label_field="username")),
FieldPanel("author", widget=TomSelectWidget(label_field="username")),
FieldPanel("participants", widget=TomSelectMultipleWidget(label_field="username")),
FieldPanel("labels"),
FieldPanel("body"),
FieldPanel("guests"),
Expand Down
2 changes: 1 addition & 1 deletion myhpi/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"django.contrib.staticfiles",
"django.contrib.messages",
"django_bootstrap_icons",
"django_select2",
"django_tomselect",
"modelcluster",
"mozilla_django_oidc",
"taggit",
Expand Down
3 changes: 2 additions & 1 deletion myhpi/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
from django.contrib.auth import views as auth_views
from django.urls import include, path, reverse_lazy
from django.views.generic import RedirectView
from django_tomselect.views import AutocompleteView
from wagtail.admin import urls as wagtailadmin_urls
from wagtail.core import urls as wagtail_urls
from wagtail.documents import urls as wagtaildocs_urls
Expand All @@ -25,7 +26,7 @@
),
name="login",
),
path("select2/", include("django_select2.urls")),
path("autocomplete/", AutocompleteView.as_view(), name="autocomplete"),
path("__debug__/", include("debug_toolbar.urls")),
path(
".well-known/security.txt",
Expand Down
52 changes: 16 additions & 36 deletions poetry.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ django-environ = "^0.10.0"
wagtail-localize = "^1.4"
mozilla-django-oidc = "^3.0.0"
django-bootstrap-icons = "^0.8.3"
django-select2 = "^8.1.2"
django-static-precompiler = {extras = ["libsass"], version = "^2.4"}
django-debug-toolbar = "^4.2.0"
django-permissionedforms = "^0.1"
tenca = "^0.0.2"
html2text = "^2020.1.16"
wagtail-markdown = "^0.10.0"
autoflake = "^2.2.1"
django-tomselect = "^0.4.4"

[tool.poetry.group.dev.dependencies]
pylint = "^2.17.5"
Expand Down