odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4171 revid:dle@openerp.com-20140409093422-imrg2hqozf46kj8d 

bzr revid: dle@openerp.com-20140409093616-3060or02z8zmv8tm
This commit is contained in:
Denis Ledoux 2014-04-09 11:36:16 +02:00
parent 6e52ba2487 b00a7562f9
commit f6a6394980
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/web/static/src/css/base.css
View File

@ -2364,7 +2364,6 @@
}
.openerp .oe_hidden_input_file {
position: relative;
overflow-x: hidden;
}
.openerp .oe_hidden_input_file input.oe_form_binary_file {
z-index: 0;

1
addons/web/static/src/css/base.sass
View File

@ -1922,7 +1922,6 @@ $sheet-padding: 16px
// Position: relative is used for the hidden input[type=file]
// Do not remove it anymore !
position: relative
overflow-x: hidden
input.oe_form_binary_file
z-index: 0
line-height: 0

11
addons/web/static/src/js/view_list_editable.js
View File

@ -126,10 +126,19 @@
* as an editable row at the top or bottom of the list)
*/
do_add_record: function () {
var self = this;
if (this.editable()) {
this.$el.find('table:first').show();
this.$el.find('.oe_view_nocontent').remove();
this.start_edition();
this.start_edition().then(function(){
var fields = self.editor.form.fields;
self.editor.form.fields_order.some(function(field){
if (fields[field].$el.is(':visible')){
fields[field].$el.find("input").select();
return true;
}
});
});
} else {
this._super();
}

1
addons/web/static/src/xml/base.xml
View File

@ -1252,6 +1252,7 @@
<td>
<t t-call="HiddenInputFile">
<t t-set="fileupload_id" t-value="widget.fileupload_id"/>
<t t-set="fileupload_style" t-translation="off">overflow-x: hidden</t>
<button class="oe_button oe_field_button" type="button">
<img t-att-src='_s + "/web/static/src/img/icons/STOCK_DIRECTORY.png"'/>
<span>Select</span>