← Back to branch summary

~openerp-dev/openobject-server/trunk-product-variants-ref-chm

« back to all changes in this revision

Viewing changes to openerp/addons/base/ir/ir_ui_view.py

  • Committer: chm at openerp
  • Date: 2014-05-07 08:38:18 UTC
  • mfrom: (5198.1.12 trunk)
  • Revision ID: chm@openerp.com-20140507083818-x3v3uuulfntb4xq6
[MERGE] from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/addons/base/ir/ir_ui_view.py
927
927
        )
928
928
        qcontext.update(values)
929
929
 
 
930
        # TODO: remove this as soon as the following branch is merged
 
931
        #       lp:~openerp-dev/openerp-web/trunk-module-closure-style-msh
 
932
        from openerp.addons.web.controllers.main import module_boot
 
933
        qcontext['modules'] = simplejson.dumps(module_boot()) if request else None
 
934
 
930
935
        def loader(name):
931
936
            return self.read_template(cr, uid, name, context=context)
932
937