diff options
| -rw-r--r-- | ishtar_common/forms_common.py | 2 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/bs_form_snippet.html | 27 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/form.html | 4 |
3 files changed, 6 insertions, 27 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index f98a97385..403f9fe5f 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -296,6 +296,7 @@ class OrganizationForm(ManageOldType, NewItemForm): class OrganizationSelect(TableSelect): + search_vector = forms.CharField(label=_(u"Full text search")) name = forms.CharField(label=_(u"Name"), max_length=300) organization_type = forms.ChoiceField(label=_(u"Type"), choices=[]) @@ -306,6 +307,7 @@ class OrganizationSelect(TableSelect): class OrganizationFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Organization search") associated_models = {'pk': models.Organization} currents = {'pk': models.Organization} diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html index a9042ff67..dc24b2849 100644 --- a/ishtar_common/templates/blocks/bs_form_snippet.html +++ b/ishtar_common/templates/blocks/bs_form_snippet.html @@ -64,31 +64,8 @@ <div class="form-row"> {% endif %} - <div class="form-group col-lg-6"> - {{ field.label_tag }} - {% if field.help_text %} - <div class="input-group"> - {% endif %} - {{field|safe}} - {% if field.help_text %} - <span class="input-group-append"> - <a class="input-group-text" data-toggle="collapse" - href="#{{field.auto_id}}_help" - aria-expanded="false" aria-controls="{{field.auto_id}}_help"> - <i class="fa fa-question-circle" aria-hidden="true"></i> - </a> - </span> - </div> - <div class="collapse" id="{{field.auto_id}}_help"> - <div class="card card-body"> - {{field.help_text}} - </div> - </div> - {% endif %} - {% if field.errors %}<div class="invalid-feedback"> - {{ field.errors }} - </div>{% endif %} - </div> + + {% include "blocks/bs_field_snippet.html" %} {% if forloop.last %} {% if search and forloop.counter0 >= 1 %} </div> diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html index 246f719ed..b2cc0c81d 100644 --- a/ishtar_common/templates/ishtar/form.html +++ b/ishtar_common/templates/ishtar/form.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load i18n inline_formset %} +{% load i18n inline_formset table_form %} {% block content %} <h2>{{page_name}}</h2> <div class='form'> @@ -8,7 +8,7 @@ {% for error in form.non_field_errors %} <p>{{ error }}</p> {% endfor %} -{{form}} + {% bs_form form %} </form> </div> {% endblock %} |