← 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/views.js

[MERGE] from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/js/views.js
411
411
            var groupby = results.group_by.length
412
412
                        ? results.group_by
413
413
                        : action_context.group_by;
 
414
            if (_.isString(groupby)) {
 
415
                groupby = [groupby];
 
416
            }
414
417
            controller.do_search(results.domain, results.context, groupby || []);
415
418
        });
416
419
    },
760
763
        _(log_records.reverse()).each(function (record) {
761
764
            var context = {};
762
765
            if (record.context) {
763
 
                try { context = py.eval(record.context).toJSON(); }
 
766
                try { context = py.eval(record.context); }
764
767
                catch (e) { /* TODO: what do I do now? */ }
765
768
            }
766
769
            $(_.str.sprintf('<li><a href="#">%s</a></li>', record.name))