[IMP] improved custom filters.

bzr revid: nicolas.vanhoren@openerp.com-20110520102030-bpzlt2z87cz104ic

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index a770531..d677529 100644 (file)
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -706,7 +706,7 @@ openerp.base.search.ExtendedSearch = openerp.base.BaseWidget.extend({
     },
     add_group: function() {
         var group = new openerp.base.search.ExtendedSearchGroup(this, this.fields);
-        var render = group.render({});
+        var render = group.render({'index': this.children.length - 1});
         this.$element.find('.searchview_extended_groups_list').append(render);
         group.start();
     },
@@ -759,7 +759,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.BaseWidget.extend({
     },
     add_prop: function() {
         var prop = new openerp.base.search.ExtendedSearchProposition(this, this.fields);
-        var render = prop.render({});
+        var render = prop.render({'index': this.children.length - 1});
         this.$element.find('.searchview_extended_propositions_list').append(render);
         prop.start();
     },

diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml
index 571ba00..b26669f 100644 (file)
--- a/addons/base/static/src/xml/base.xml
+++ b/addons/base/static/src/xml/base.xml
@@ -617,7 +617,7 @@
             <option value="any">Any of the following conditions must match</option>
             <option value="none">None of the following conditions must match</option>
         </select>
-        <button class="searchview_extended_delete_group"
+        <button t-if="index > 0" class="searchview_extended_delete_group"
                 type="button"><span>Delete this group of conditions</span></button>
         <div class="searchview_extended_propositions_list">
         </div>
@@ -636,7 +636,7 @@
         </select>
         <select class="searchview_extended_prop_op"/>
         <span class="searchview_extended_prop_value"/>
-        <button class="searchview_extended_delete_prop"
+        <button t-if="index > 0" class="searchview_extended_delete_prop"
                 type="button"><span>Delete this condition</span></button>
     </div>
 </t>