From 9895bc0984aebdd25a28d76893f4d42fa7b164e9 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Dec 2011 10:51:23 +0100
Subject: [IMP] Remove bottom pager from o2m

bzr revid: fme@openerp.com-20111214095123-ks095wgp4bvf56bu
---
 addons/web/static/src/xml/base.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index f1f8990bfc5..a8784907562 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -619,6 +619,9 @@
     <t t-jquery="thead.ui-widget-header > tr:first">
         this.removeAttr('t-if');
     </t>
+
+    <t t-jquery="tfoot &gt; tr:last-child" t-operation="replace"/>
+
     <t t-jquery="td.oe-actions">
         this.removeAttr('t-if');
         var $title = $(document.createElement('h3')).addClass('oe_view_title');
-- 
cgit v1.2.3


From 83f694ed7a9d56b3807ea41ec12dfe413fc0beee Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Dec 2011 11:13:44 +0100
Subject: [IMP] Merge Advanced Filter button in select box and float it right

bzr revid: fme@openerp.com-20111214101344-61j1cpcjy4bdsz0w
---
 addons/web/static/src/xml/base.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a8784907562..8ab323e776a 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -1151,7 +1151,6 @@
         <div class="oe_search-view-buttons">
             <button>Search</button>
             <button type="reset">Clear</button>
-            <button type="button" class="oe_search-view-custom-filter-btn"><span>Advanced Filter</span></button>
             <select class="oe_search-view-filters-management">
             </select>
         </div>
@@ -1165,6 +1164,7 @@
         </t>
     </optgroup>
     <optgroup label="-- Actions --">
+        <option value="advanced_filter">Advanced Filter</option>
         <option value="save_filter">Save Filter</option>
         <option value="add_to_dashboard">Add to Dashboard</option>
         <option value="manage_filters">Manage Filters</option>
-- 
cgit v1.2.3


From a5850d82a779d674ebd7bc159df72193ec861a99 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi <fme@openerp.com>
Date: Wed, 14 Dec 2011 15:17:29 +0100
Subject: [IMP] o2m: do not display viewmanager header when only one view
 defined

bzr revid: fme@openerp.com-20111214141729-2oj23myi1ot42i21
---
 addons/web/static/src/xml/base.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8ab323e776a..a861c3c93f5 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -483,6 +483,10 @@
 </t>
 <t t-extend="ViewManager" t-name="One2Many.viewmanager">
     <t t-jquery="span.oe_view_title_text" t-operation="replace"/>
+
+    <t t-jquery=".oe-view-manager-header">
+        this.attr('t-if', 'views.length != 1');
+    </t>
 </t>
 
 <t t-name="Sidebar">
-- 
cgit v1.2.3


From e557a4b4c0d720c778828b73eae19920e9cf8f66 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Wed, 14 Dec 2011 15:43:17 +0100
Subject: [FIX] don't display add/remove buttons in group_by_no_leaf views

bzr revid: xmo@openerp.com-20111214144317-7k0u4s2xg9ochpte
---
 addons/web/static/src/xml/base.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'addons/web/static/src/xml/base.xml')

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index a861c3c93f5..cf517fef490 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -573,7 +573,7 @@
             <th t-att-colspan="columns_count">
                 <table>
                     <tr>
-                        <td t-if="options.action_buttons !== false" class="oe-actions">
+                        <td t-if="!no_leaf and options.action_buttons !== false" class="oe-actions">
                             <button type="button" class="oe-list-add"
                                     t-if="options.addable">
                                 <t t-esc="options.addable"/>
@@ -634,7 +634,7 @@
         this.prepend($title);
     </t>
 </t>
-<th t-name="Listview.navigation.button" t-if="options.pager !== false"
+<th t-name="Listview.navigation.button" t-if="!no_leaf and options.pager !== false"
         class="oe-list-pager" t-att-colspan="columns_count">
     <button type="button" disabled="disabled"
             data-pager-action="first">First</button>
-- 
cgit v1.2.3