diff -r 39b7a91a3f4c -r 032825bbacab hooks/security.py --- a/hooks/security.py Thu Jan 23 12:32:16 2014 +0100 +++ b/hooks/security.py Thu Jan 23 13:47:28 2014 +0100 @@ -78,8 +78,8 @@ def precommit_event(self): session = self.session for action, rschema, eidfrom, eidto in self.get_data(): - rdef = rschema.rdef(session.describe(eidfrom)[0], - session.describe(eidto)[0]) + rdef = rschema.rdef(session.entity_metas(eidfrom)['type'], + session.entity_metas(eidto)['type']) rdef.check_perm(session, action, fromeid=eidfrom, toeid=eidto) @@ -134,8 +134,8 @@ if (self.eidfrom, self.rtype, self.eidto) in nocheck: return rschema = self._cw.repo.schema[self.rtype] - rdef = rschema.rdef(self._cw.describe(self.eidfrom)[0], - self._cw.describe(self.eidto)[0]) + rdef = rschema.rdef(self._cw.entity_metas(self.eidfrom)['type'], + self._cw.entity_metas(self.eidto)['type']) rdef.check_perm(self._cw, 'add', fromeid=self.eidfrom, toeid=self.eidto) @@ -153,8 +153,8 @@ CheckRelationPermissionOp.get_instance(self._cw).add_data( ('add', rschema, self.eidfrom, self.eidto) ) else: - rdef = rschema.rdef(self._cw.describe(self.eidfrom)[0], - self._cw.describe(self.eidto)[0]) + rdef = rschema.rdef(self._cw.entity_metas(self.eidfrom)['type'], + self._cw.entity_metas(self.eidto)['type']) rdef.check_perm(self._cw, 'add', fromeid=self.eidfrom, toeid=self.eidto) @@ -167,7 +167,7 @@ if (self.eidfrom, self.rtype, self.eidto) in nocheck: return rschema = self._cw.repo.schema[self.rtype] - rdef = rschema.rdef(self._cw.describe(self.eidfrom)[0], - self._cw.describe(self.eidto)[0]) + rdef = rschema.rdef(self._cw.entity_metas(self.eidfrom)['type'], + self._cw.entity_metas(self.eidto)['type']) rdef.check_perm(self._cw, 'delete', fromeid=self.eidfrom, toeid=self.eidto)