Purnendu Singh (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-addons_16_general 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-addons_16_general/+merge/131312
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-addons_16_general/+merge/131312
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-addons_16_general.
=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js 2012-10-23 09:55:59 +0000
+++ addons/web/static/src/js/view_list.js 2012-10-25 06:18:33 +0000
@@ -1097,7 +1097,6 @@
}, this);
if (!this.$current) { return; }
this.$current.remove();
- this.$current = null;
},
get_records: function () {
return this.records.map(function (record) {
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-10-19 11:46:05 +0000
+++ addons/web/static/src/xml/base.xml 2012-10-25 06:18:33 +0000
@@ -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>
_______________________________________________
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
