Fabien (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-patest-w45 into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-patest-w45/+merge/136106
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-patest-w45/+merge/136106
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-24 18:03:21 +0000
+++ addons/web/static/src/css/base.css 2012-11-26 07:38:14 +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-24 18:03:21 +0000
+++ addons/web/static/src/css/base.sass 2012-11-26 07:38:14 +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-21 13:56:57 +0000
+++ addons/web/static/src/js/search.js 2012-11-26 07:38:14 +0000
@@ -1709,9 +1709,14 @@
return $.when(
this._super(),
this.rpc("/web/searchview/fields_get", {model: this.view.model}).done(function(data) {
+ _.each(_.keys(data.fields),function(key){
+ if(data.fields[key].fnct_search === false){
+ delete data.fields[key];
+ }
+ });
self.fields = _.extend({
id: { string: 'ID', type: 'id' }
- }, data.fields);
+ },data.fields);
})).done(function () {
self.append_proposition();
});
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
