← Back to branch summary

~openerp-dev/openobject-server/saas-4-forum-crawl-xmo

« back to all changes in this revision

Viewing changes to openerp/tools/convert.py

  • Committer: Denis Ledoux
  • Date: 2014-04-24 13:55:07 UTC
  • Revision ID: dle@openerp.com-20140424135507-5130yyy5brpfqd5f
[FIX] http: set back the gen_session_id controller, because still used by openframework.js of web branch

Related to revision 5124 revid:al@openerp.com-20140316141311-m0xqh386ax952va1

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/tools/convert.py
305
305
 
306
306
        if d_search:
307
307
            idref = _get_idref(self, cr, self.uid, d_model, context={}, idref={})
308
 
            try:
309
 
                ids = self.pool[d_model].search(cr, self.uid, unsafe_eval(d_search, idref))
310
 
            except ValueError:
311
 
                _logger.warning('Skipping deletion for failed search `%r`', d_search, exc_info=True)
312
 
                pass
 
308
            ids = self.pool[d_model].search(cr, self.uid, unsafe_eval(d_search, idref))
313
309
        if d_id:
314
310
            try:
315
311
                ids.append(self.id_get(cr, d_id))
316
 
            except ValueError:
 
312
            except:
317
313
                # d_id cannot be found. doesn't matter in this case
318
 
                _logger.warning('Skipping deletion for missing XML ID `%r`', d_id, exc_info=True)
319
314
                pass
320
315
        if ids:
321
316
            self.pool[d_model].unlink(cr, self.uid, ids)