diff options
| author | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
|---|---|---|
| committer | Jiten (OpenERP) <jra@tinyerp.com> | 2012-11-05 10:44:17 +0530 |
| commit | 77dbc558cf2de8bd6013c82e1ae3e84d2e2f6a40 (patch) | |
| tree | cd84be4601dd49817df075722d2e65388f9c1e68 /addons/web/static/src/xml/base.xml | |
| parent | 7184bd91515886ec8c2e4cddd163cba3658be781 (diff) | |
| parent | 74cda3df5bdf6be39358d804ea268401ee677401 (diff) | |
[MERGE] Merged trunk.
bzr revid: jra@tinyerp.com-20121102111255-wu683od04sr9h8dg
bzr revid: jra@tinyerp.com-20121105051417-pa5spswlxg20xcqx
Diffstat (limited to 'addons/web/static/src/xml/base.xml')
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bdb21952e23..a08fc9dc78c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1190,7 +1190,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> |