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

[FIX] don't lose indentations and explicit line breaks in readonly text fields 

bzr revid: xmo@openerp.com-20111212162210-o2z70yf3cybpajvq
This commit is contained in:
Xavier Morel 2011-12-12 17:22:10 +01:00
parent 33642e464a
commit ca292d50e7
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1120,6 +1120,10 @@ label.error {
background-color: white;
}
.openerp .oe_form_readonly .oe_form_field_text div.field_text {
white-space: pre-wrap;
}
/* Inputs */
.openerp .oe_forms input[type="text"], .openerp .oe_forms input[type="password"], .openerp .oe_forms select, .openerp .oe_forms textarea {

4
addons/web/static/src/js/view_page.js
View File

@ -59,6 +59,9 @@ openerp.web.page = function (openerp) {
/** @namespace */
openerp.web.page = {};
openerp.web.page.WidgetFrameReadonly = openerp.web.form.WidgetFrame.extend({
template: 'WidgetFrame.readonly'
});
openerp.web.page.FieldReadonly = openerp.web.form.Field.extend({
});
@ -197,6 +200,7 @@ openerp.web.page = function (openerp) {
force_readonly: true
});
openerp.web.page.readonly = openerp.web.form.widgets.clone({
'frame': 'openerp.web.page.WidgetFrameReadonly',
'char': 'openerp.web.page.FieldCharReadonly',
'email': 'openerp.web.page.FieldEmailReadonly',
'url': 'openerp.web.page.FieldUrlReadonly',

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

@ -869,8 +869,7 @@
<t t-name="FieldChar.readonly">
<div
t-att-id="widget.element_id"
t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}"
style="width: 100%">
t-attf-class="field_#{widget.type} #{_(['integer', 'float', 'float_time']).contains(widget.type) ? 'oe-number' : ''}">
</div>
</t>
<t t-name="FieldURI.readonly">