# HG changeset patch # User Adrien Di Mascio # Date 1253705306 -7200 # Node ID 6ea4a2ff01c905a4b3420227b186801fc52bbfc0 # Parent 4035fc72d73cbc24e7e66a4ac4b01bfdb5420194 [api] use cw_* diff -r 4035fc72d73c -r 6ea4a2ff01c9 appobject.py --- a/appobject.py Wed Sep 23 13:27:05 2009 +0200 +++ b/appobject.py Wed Sep 23 13:28:26 2009 +0200 @@ -370,15 +370,15 @@ @deprecated('[3.6] use self.cw_rset.limited_rql') def limited_rql(self): - return self.rset.limited_rql() + return self.cw_rset.limited_rql() @deprecated('[3.6] use self.cw_rset.complete_entity(row,col) instead') def complete_entity(self, row, col=0, skip_bytes=True): - return self.rset.complete_entity(row, col, skip_bytes) + return self.cw_rset.complete_entity(row, col, skip_bytes) @deprecated('[3.6] use self.cw_rset.get_entity(row,col) instead') def entity(self, row, col=0): - return self.rset.get_entity(row, col) + return self.cw_rset.get_entity(row, col) @deprecated('[3.6] use self._cw.user_rql_callback') def user_rql_callback(self, args, msg=None): diff -r 4035fc72d73c -r 6ea4a2ff01c9 common/mixins.py --- a/common/mixins.py Wed Sep 23 13:27:05 2009 +0200 +++ b/common/mixins.py Wed Sep 23 13:28:26 2009 +0200 @@ -155,7 +155,7 @@ def root(self): """return the root object""" - return self.req.entity_from_eid(self.path()[0]) + return self._cw.entity_from_eid(self.path()[0]) class EmailableMixIn(object): @@ -209,7 +209,7 @@ done = set() entity = view.rset.get_entity(row, col) if entity.eid in done: - msg = entity.req._('loop in %(rel)s relation (%(eid)s)') % { + msg = entity._cw._('loop in %(rel)s relation (%(eid)s)') % { 'rel': entity.tree_attribute, 'eid': entity.eid }