← Back to branch summary

~openerp-dev/openerp-web/6.1-web-custo-mmu-access-denied-email

« back to all changes in this revision

Viewing changes to addons/web/controllers/main.py

  • Committer: tfr at openerp
  • Date: 2012-08-21 16:25:06 UTC
  • mfrom: (2365.6.29 6.1)
  • Revision ID: tfr@openerp.com-20120821162506-1a41st9l3cz22a8e
[MERGE] from stable

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/controllers/main.py
142
142
            if mods is not None:
143
143
                path += '?mods=' + mods
144
144
            return [path]
145
 
        return ['%s?debug=%s' % (wp, os.path.getmtime(fp)) for fp, wp in self.manifest_glob(req, mods, extension)]
 
145
        # re-normalize fs paths to URLs: split on fs path separator
 
146
        # ('/' or '\\' usually) and join on url path separator ('/')
 
147
        return ['%s?debug=%s' % ('/'.join(wp.split(os.path.sep)), os.path.getmtime(fp))
 
148
                for fp, wp in self.manifest_glob(req, mods, extension)]
146
149
 
147
150
    @openerpweb.jsonrequest
148
151
    def csslist(self, req, mods=None):
1919
1922
    @openerpweb.httprequest
1920
1923
    def import_data(self, req, model, csvfile, csvsep, csvdel, csvcode, jsonp,
1921
1924
                    meta):
1922
 
        modle_obj = req.session.model(model)
1923
 
        skip, indices, fields = operator.itemgetter('skip', 'indices', 'fields')(
1924
 
            simplejson.loads(meta))
 
1925
        skip, indices, fields, context = \
 
1926
            operator.itemgetter('skip', 'indices', 'fields', 'context')(
 
1927
                simplejson.loads(meta, object_hook=common.nonliterals.non_literal_decoder))
1925
1928
 
1926
1929
        error = None
1927
1930
        if not (csvdel and len(csvdel) == 1):
1971
1974
                jsonp, simplejson.dumps({'error': {'message': error}}))
1972
1975
 
1973
1976
        try:
1974
 
            (code, record, message, _nope) = modle_obj.import_data(
 
1977
            (code, record, message, _nope) = req.session.model(model).import_data(
1975
1978
                fields, data, 'init', '', False,
1976
 
                req.session.eval_context(req.context))
 
1979
                req.session.eval_context(context))
1977
1980
        except xmlrpclib.Fault, e:
1978
1981
            error = {"message": u"%s, %s" % (e.faultCode, e.faultString)}
1979
1982
            return '<script>window.top.%s(%s);</script>' % (