From eba86ae6bc944878906d632714c455f19726272c Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Tue, 11 Mar 2014 16:22:28 +0100
Subject: [PATCH] [gen] Bugfix in Ref field.

---
 fields/ref.py               | 3 ++-
 gen/wrappers/ToolWrapper.py | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/fields/ref.py b/fields/ref.py
index 6e2e4e1..867f69f 100644
--- a/fields/ref.py
+++ b/fields/ref.py
@@ -180,7 +180,8 @@ class Ref(Field):
                align="column.align" var2="refField=column.field">
             <span>:_(refField.labelId)</span>
             <x>:field.pxSortIcons</x>
-            <x var="className=tiedClassName">:tool.pxShowDetails</x>
+            <x var="className=tiedClassName;
+                    field=refField">:tool.pxShowDetails</x>
            </th>
           </tr>
           <tr for="ztied in zobjects" valign="top"
diff --git a/gen/wrappers/ToolWrapper.py b/gen/wrappers/ToolWrapper.py
index 3b3e269..7206f29 100644
--- a/gen/wrappers/ToolWrapper.py
+++ b/gen/wrappers/ToolWrapper.py
@@ -14,13 +14,13 @@ class ToolWrapper(AbstractWrapper):
     # Icon for hiding/showing details below the title of an object shown in a
     # list of objects.
     pxShowDetails = Px('''
-     <img if="ztool.subTitleIsUsed(className) and (field.name == 'title')"
+     <img if="(field.name == 'title') and ztool.subTitleIsUsed(className)"
           class="clickable" src=":url('toggleDetails')"
           onclick="toggleSubTitles()"/>''')
 
     # Displays up/down arrows in a table header column for sorting a given
     # column. Requires variables "sortable", 'filterable' and 'field'.
-    pxSortAndFilter = Px('''<x>
+    pxSortAndFilter = Px('''
      <x if="sortable">
       <img if="(sortKey != field.name) or (sortOrder == 'desc')"
            onclick=":navBaseCall.replace('**v**', '0,%s,%s,%s' % \
@@ -37,7 +37,7 @@ class ToolWrapper(AbstractWrapper):
       <img onclick=":navBaseCall.replace('**v**', '0, %s,%s,%s' % \
                      (q(sortKey), q(sortOrder), q(field.name)))"
            src=":url('funnel')" class="clickable"/>
-     </x></x>''')
+     </x>''')
 
     # Buttons for navigating among a list of objects (from a Ref field or a
     # query): next,back,first,last...