diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2016-01-10 15:35:51 +0100 |
| commit | 9de20f503852855b5dda8723693c5d156232d16d (patch) | |
| tree | 8d8e7c09faf179b2fed07878d1cf450a245a78d0 /ishtar_common/templates/blocks | |
| parent | 5e0b683ccc3851a4092e4d459a43fb557299d47e (diff) | |
| parent | 23622f70dc4b6b544dcd99994e46ea20ff309777 (diff) | |
| download | Ishtar-9de20f503852855b5dda8723693c5d156232d16d.tar.bz2 Ishtar-9de20f503852855b5dda8723693c5d156232d16d.zip | |
Merge branch 'master' into master-land-planner-2999
Diffstat (limited to 'ishtar_common/templates/blocks')
| -rw-r--r-- | ishtar_common/templates/blocks/JQueryJqGrid.html | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/blocks/inline_formset.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html index 7e7086738..e8647dadf 100644 --- a/ishtar_common/templates/blocks/JQueryJqGrid.html +++ b/ishtar_common/templates/blocks/JQueryJqGrid.html @@ -73,6 +73,7 @@ jQuery(document).ready(function(){ {name:'link', index:'link', width:30}, {{extra_cols|safe}} ], + height: 300, sortname: 'value', viewrecords: true, sortorder: "asc", diff --git a/ishtar_common/templates/blocks/inline_formset.html b/ishtar_common/templates/blocks/inline_formset.html index 3affb7bf3..4d4042985 100644 --- a/ishtar_common/templates/blocks/inline_formset.html +++ b/ishtar_common/templates/blocks/inline_formset.html @@ -12,7 +12,7 @@ {% if frm.errors %}<tr><td colspan='3'><ul>{% for error in frm.errors.values %}<li>{{error}}</li>{% endfor%}</ul></td></tr>{% endif %} <tr>{% endif %}{% for field in frm.visible_fields %}<td> {% if field.errors %}<div class='errors'>{{ field.errors.as_ul }}</div>{% endif %} - {{ field }} + {{ field|safe }} {# Include the hidden fields in the form #} {% if forloop.first %} {{ formset.management_form }} |