← Back to branch summary

~therp-nl/openerp-web/7.0-lp1013636-x2m_honour_required_attribute

« back to all changes in this revision

Viewing changes to addons/web/static/src/js/formats.js

[MERGE] from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/js/formats.js
148
148
            if (typeof(value) == "string")
149
149
                value = openerp.web.auto_str_to_date(value);
150
150
            return value.toString(normalize_format(l10n.time_format));
151
 
        case 'selection':
 
151
        case 'selection': case 'statusbar':
152
152
            // Each choice is [value, label]
153
153
            if(_.isArray(value)) {
154
154
                 value = value[0]
336
336
    case 'progressbar':
337
337
        return _.template(
338
338
            '<progress value="<%-value%>" max="100"><%-value%>%</progress>', {
339
 
                value: _.str.sprintf("%.0f", row_data[column.id].value)
 
339
                value: _.str.sprintf("%.0f", row_data[column.id].value || 0)
340
340
            });
341
341
    }
342
342