From 081b7d77d60f583cb184f034b3424bb1a620c610 Mon Sep 17 00:00:00 2001 From: kbh Date: Fri, 12 Aug 2011 11:33:06 +0530 Subject: [PATCH] [FIX] Fixed clear option. bzr revid: kbh@bde-desktop-20110812060306-ozmfx36vvz1uy1h0 --- addons/base/static/src/js/search.js | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js index 76cfb5864e8..8a4f542f1c7 100644 --- a/addons/base/static/src/js/search.js +++ b/addons/base/static/src/js/search.js @@ -316,24 +316,13 @@ openerp.base.SearchView = openerp.base.Widget.extend({ this.notification.notify("Invalid Search", "triggered from search view"); }, do_clear: function () { - this.$element.find(':input').each(function(){ - switch(this.type) { - case 'text': - case 'string': - $(this).val(''); - break; - } - }); - var string = ($("div.expanded").not("#oe_app_search table:first-child .expanded")); - if (string){ - $(string).removeClass('expanded'); - $(string).addClass('folded'); - } - $('#oe_app_search table:last').css('display', 'none'); + var string = $('a.searchview_group_string'); + _.each(string, function(str){ + $(str).closest('div.searchview_group').removeClass("expanded").addClass('folded'); + }); + this.$element.find('table:last').hide(); $('.searchview_extended_groups_list').empty(); $('.filter_label').removeClass('enabled'); - this.$element.find('form').submit(); - }, /** * Triggered when the search view gets cleared @@ -475,7 +464,7 @@ openerp.base.search.FilterGroup = openerp.base.search.Widget.extend({ }); openerp.base.search.add_expand_listener = function($root) { $root.find('a.searchview_group_string').click(function (e) { - $root.toggleClass('folded expanded'); + $root.toggleClass('folded expanded'); e.stopPropagation(); e.preventDefault(); });