# HG changeset patch # User Sylvain Thénault # Date 1271166404 -7200 # Node ID 9ff0dee81eb2b0b2976ef6d726449a6f0abb3fbb # Parent ed6905d98a5e2bb0c112d40265f087265b844607 [facet] don't crash in rset_vocabulary if an unauthorized error was raised in rqlexec diff -r ed6905d98a5e -r 9ff0dee81eb2 web/facet.py --- a/web/facet.py Mon Apr 12 19:36:51 2010 +0200 +++ b/web/facet.py Tue Apr 13 15:46:44 2010 +0200 @@ -379,7 +379,9 @@ return () finally: rqlst.recover() - return self.rset_vocabulary(rset) + # don't call rset_vocabulary on empty result set, it may be an empty + # *list* (see rqlexec implementation) + return rset and self.rset_vocabulary(rset) def possible_values(self): """return a list of possible values (as string since it's used to @@ -468,7 +470,9 @@ return () finally: rqlst.recover() - return self.rset_vocabulary(rset) + # don't call rset_vocabulary on empty result set, it may be an empty + # *list* (see rqlexec implementation) + return rset and self.rset_vocabulary(rset) def rset_vocabulary(self, rset): _ = self._cw._