From 61e9552f6dcf29003dfbb842336c752d5f94a4dd Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 10:36:10 +0200
Subject: [FIX] reintroduce o2m search field, aliases to CharField. Also make
 m2m search field an actual alias to CharField

bzr revid: xmo@openerp.com-20110812083610-utduagt0np0h7rib
---
 addons/base/static/src/js/search.js | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'addons/base/static/src/js')

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index e88e31ebba0..4b746832a65 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -362,7 +362,8 @@ openerp.base.search.fields = new openerp.base.Registry({
     'datetime': 'openerp.base.search.DateTimeField',
     'date': 'openerp.base.search.DateField',
     'many2one': 'openerp.base.search.ManyToOneField',
-    'many2many': 'openerp.base.search.ManyToManyField'
+    'many2many': 'openerp.base.search.CharField',
+    'one2many': 'openerp.base.search.CharField'
 });
 openerp.base.search.Invalid = openerp.base.Class.extend( /** @lends openerp.base.search.Invalid# */{
     /**
@@ -723,11 +724,8 @@ openerp.base.search.DateField = openerp.base.search.Field.extend( /** @lends ope
     }
 });
 openerp.base.search.DateTimeField = openerp.base.search.DateField.extend({
-    // TODO: time?
 });
 openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
-    // TODO: @widget
-    // TODO: .selection, .context, .domain
     init: function (view_section, field, view) {
         this._super(view_section, field, view);
         var self = this;
@@ -795,12 +793,6 @@ openerp.base.search.ManyToOneField = openerp.base.search.CharField.extend({
         return this._super();
     }
 });
-/**
- * m2m search field behaves pretty much exactly like a char field
- *
- * @class
- */
-openerp.base.search.ManyToManyField = openerp.base.search.CharField.extend({});
 
 openerp.base.search.ExtendedSearch = openerp.base.OldWidget.extend({
     template: 'SearchView.extended_search',
-- 
cgit v1.2.3


From 4e5f4bd565bbaff2a8f89117c791de9299015e08 Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 12 Aug 2011 11:45:41 +0200
Subject: [IMP] simple style fixes

bzr revid: xmo@openerp.com-20110812094541-zeb5lz6nk0jgq21y
---
 addons/base/static/src/js/search.js | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'addons/base/static/src/js')

diff --git a/addons/base/static/src/js/search.js b/addons/base/static/src/js/search.js
index 4b746832a65..63ccec088a6 100644
--- a/addons/base/static/src/js/search.js
+++ b/addons/base/static/src/js/search.js
@@ -875,11 +875,10 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         this._super();
         var _this = this;
         this.add_prop();
-        this.$element.find('.searchview_extended_add_proposition').click(function (e) {
+        this.$element.find('.searchview_extended_add_proposition').click(function () {
             _this.add_prop();
         });
-        var delete_btn = this.$element.find('.searchview_extended_delete_group');
-        delete_btn.click(function (e) {
+        this.$element.find('.searchview_extended_delete_group').click(function () {
             _this.stop();
         });
     },
@@ -889,7 +888,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         }).compact().value();
         var choice = this.$element.find(".searchview_extended_group_choice").val();
         var op = choice == "all" ? "&" : "|";
-        return [].concat(choice == "none" ? ['!'] : [],
+        return choice == "none" ? ['!'] : [].concat(
             _.map(_.range(_.max([0,props.length - 1])), function() { return op; }),
             props);
     },
@@ -901,10 +900,7 @@ openerp.base.search.ExtendedSearchGroup = openerp.base.OldWidget.extend({
         parent.check_last_element();
     },
     set_last_group: function(is_last) {
-        if(is_last)
-            this.$element.addClass("last_group");
-        else
-            this.$element.removeClass("last_group");
+        this.$element.toggleClass('last_group', is_last);
     }
 });
 
@@ -927,8 +923,7 @@ openerp.base.search.ExtendedSearchProposition = openerp.base.OldWidget.extend({
         this.$element.find(".searchview_extended_prop_field").change(function() {
             _this.changed();
         });
-        var delete_btn = this.$element.find('.searchview_extended_delete_prop');
-        delete_btn.click(function (e) {
+        this.$element.find('.searchview_extended_delete_prop').click(function () {
             _this.stop();
         });
     },
-- 
cgit v1.2.3