Skip to content

Commit

Permalink
Changed tag selection widget to checkboxes in institution edit page.
Browse files Browse the repository at this point in the history
  • Loading branch information
dzejkob committed Oct 20, 2020
1 parent bf4b557 commit a931b4f
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 4 deletions.
3 changes: 3 additions & 0 deletions docker-compose.yml
Expand Up @@ -39,6 +39,9 @@ services:
METADEFENDER_API_KEY:
ports:
- "8000:8000"
# Uncomment following to enable debug in development:
# stdin_open: true
# tty: true

worker:
command: python manage.py process_tasks
Expand Down
5 changes: 5 additions & 0 deletions feder/assets/scss/style.scss
Expand Up @@ -150,3 +150,8 @@ $gray: #F0F0F0;
padding: 1px 5px;
font-size: 0.8em;
}

.scrollable-widget {
max-height: 400px;
overflow-y: scroll;
}
21 changes: 18 additions & 3 deletions feder/institutions/forms.py
@@ -1,13 +1,28 @@
from atom.ext.crispy_forms.forms import SingleButtonMixin
from braces.forms import UserKwargModelFormMixin
from crispy_forms.helper import FormHelper
from crispy_forms.layout import Layout, Fieldset, ButtonHolder, Submit
from dal import autocomplete
from django import forms
from django.utils.translation import ugettext_lazy as _

from .models import Institution


class InstitutionForm(SingleButtonMixin, UserKwargModelFormMixin, forms.ModelForm):
class InstitutionForm(UserKwargModelFormMixin, forms.ModelForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
# Form "helper" is needed to have control over rendering by "crispy" tag.
self.helper = FormHelper()
self.helper.layout = Layout(
Fieldset("", "name", "jst", "regon", "email"),
Fieldset("", "tags", css_class="form-group scrollable-widget"),
ButtonHolder(Submit("submit", _("Update"), css_class="btn btn-primary")),
)

class Meta:
model = Institution
fields = ["name", "tags", "jst", "regon", "email"]
widgets = {"jst": autocomplete.ModelSelect2(url="teryt:community-autocomplete")}
widgets = {
"jst": autocomplete.ModelSelect2(url="teryt:community-autocomplete"),
"tags": forms.CheckboxSelectMultiple,
}
4 changes: 4 additions & 0 deletions feder/static/css/style.css
Expand Up @@ -7473,3 +7473,7 @@ button.close {
border-radius: 15px;
padding: 1px 5px;
font-size: 0.8em; }

.scrollable-widget {
max-height: 400px;
overflow-y: scroll; }
2 changes: 1 addition & 1 deletion feder/static/css/style.min.css

Large diffs are not rendered by default.

0 comments on commit a931b4f

Please sign in to comment.