diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-18 13:34:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-18 13:34:27 +0100 |
| commit | 68a736ec91ca926b86cec6fef1e2514900047807 (patch) | |
| tree | 1477fbefb1ceac71fba1b4de22e1a39d601c0056 | |
| parent | 56b87de52de13ff47f3cb9250490edfbe03fab8a (diff) | |
| download | Ishtar-68a736ec91ca926b86cec6fef1e2514900047807.tar.bz2 Ishtar-68a736ec91ca926b86cec6fef1e2514900047807.zip | |
SEARCH -> SEARCH_AND_SELECT
| -rw-r--r-- | archaeological_operations/forms.py | 2 | ||||
| -rw-r--r-- | ishtar_common/forms_common.py | 5 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 41cc59e46..b1f87c249 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -616,7 +616,7 @@ class OperationSelect(TableSelect): class OperationFormSelection(IshtarForm): - SEARCH = True + SEARCH_AND_SELECT = True form_label = _(u"Operation search") associated_models = {'pk': models.Operation} currents = {'pk': models.Operation} diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 73971adaf..dc18a2108 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -426,6 +426,7 @@ class PersonSelect(TableSelect): class PersonFormSelection(forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Person search") associated_models = {'pk': models.Person} currents = {'pk': models.Person} @@ -521,7 +522,7 @@ class PersonUserSelect(PersonSelect): class PersonUserFormSelection(PersonFormSelection): - SEARCH = True + SEARCH_AND_SELECT = True form_label = _(u"Person search") associated_models = {'pk': models.Person} currents = {'pk': models.Person} @@ -552,7 +553,7 @@ class IshtarUserSelect(TableSelect): class AccountFormSelection(forms.Form): - SEARCH = True + SEARCH_AND_SELECT = True form_label = _(u"Account search") associated_models = {'pk': models.IshtarUser} currents = {'pk': models.IshtarUser} diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index 6c9193966..144323854 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -39,7 +39,7 @@ {% block "footer" %} <div id="footer"> {% block "validation_bar" %} - {% if wizard.form.SEARCH %} + {% if wizard.form.SEARCH_AND_SELECT %} <p class="confirm-message">{% trans "Search and select an item in the table" %}</p> {% endif %} {% include 'ishtar/wizard/validation_bar.html' %} |