[MERGE] addons 16

bzr revid: fp@openerp.com-20121102161101-hynn88pft6ipygy5
This commit is contained in:
Fabien Pinckaers
2012-11-02 17:11:01 +01:00
2 changed files with 2 additions and 2 deletions
-1
View File
@@ -1100,7 +1100,6 @@ instance.web.ListView.List = instance.web.Class.extend( /** @lends instance.web.
}, this);
if (!this.$current) { return; }
this.$current.remove();
this.$current = null;
},
get_records: function () {
return this.records.map(function (record) {
+2 -1
View File
@@ -1169,7 +1169,8 @@
<input type="hidden" name="session_id" value=""/>
<input type="hidden" name="callback" t-att-value="fileupload_id"/>
<t t-raw="__content__"/>
<input type="file" class="oe_form_binary_file" name="ufile"/>
<input type="file" class="oe_form_binary_file" name="ufile" t-if="widget.widget!='image'"/>
<input type="file" class="oe_form_binary_file" name="ufile" accept="image/*" t-if="widget.widget=='image'"/>
</form>
<iframe t-att-id="fileupload_id" t-att-name="fileupload_id" style="display: none"/>
</div>