From ab191a5873011db4b44adf6d4e532681c29b4cb3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Fri, 18 Dec 2015 18:46:44 +0100
Subject: Operation wizard: improve relations layout (form and summary)

---
 ishtar_common/templates/blocks/inline_formset.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ishtar_common/templates/blocks')

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 }}
-- 
cgit v1.2.3


From f3c4eb1726370959c9ce4d16c276151619b58121 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Mon, 28 Dec 2015 18:20:08 +0100
Subject: Higher tables in search

---
 ishtar_common/templates/blocks/JQueryJqGrid.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'ishtar_common/templates/blocks')

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",
-- 
cgit v1.2.3