ajay javiya (OpenERP) has proposed merging 
lp:~openerp-dev/openerp-web/trunk-patest-w45-fix-aja into 
lp:~openerp-dev/openerp-web/trunk-patest-w45.

Requested reviews:
  Jigar Amin  (OpenERP) (jam-openerp)

For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-patest-w45-fix-aja/+merge/134855

Hello,
Fix issue:
1)when the calendar is displayed, the "more" menu is broken if it contains 4 or 
more items.
2)Remove duplicated field name in Advanced Search.
Thank You. 
-- 
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-patest-w45-fix-aja/+merge/134855
Your team OpenERP R&D Team is subscribed to branch 
lp:~openerp-dev/openerp-web/trunk-patest-w45.
=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2012-11-15 17:51:46 +0000
+++ addons/web/static/src/css/base.css	2012-11-19 09:51:26 +0000
@@ -663,7 +663,7 @@
   position: absolute;
   top: 26px;
   left: 0;
-  z-index: 3;
+  z-index: 4;
   margin: 0;
   padding: 0;
   border: 1px solid #afafb6;

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2012-11-15 17:51:46 +0000
+++ addons/web/static/src/css/base.sass	2012-11-19 09:51:26 +0000
@@ -573,7 +573,7 @@
         position: absolute
         top: 26px
         left: 0
-        z-index: 3
+        z-index: 4
         margin: 0
         padding: 0
         border: 1px solid $tag-border

=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js	2012-11-12 16:41:36 +0000
+++ addons/web/static/src/js/search.js	2012-11-19 09:51:26 +0000
@@ -1711,7 +1711,9 @@
             this.rpc("/web/searchview/fields_get", {model: this.view.model}).done(function(data) {
                 self.fields = _.extend({
                     id: { string: 'ID', type: 'id' }
-                }, data.fields);
+                }, _.filter(data.fields, function(fld){
+                    return fld.fnct_search !== false;
+                }));
         })).done(function () {
             self.append_proposition();
         });

_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to     : openerp-dev-gtk@lists.launchpad.net
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help   : https://help.launchpad.net/ListHelp

Reply via email to