backport stable

.hgtags

@@ -25,3 +25,5 @@
 a63fa00a1cca5a0f27bb0a57182473a5aabcc604 cubicweb-comment-debian-version-1.7.2-1
 63bd8d2d0591d5b10a919c7c9cdec17f379843d9 cubicweb-comment-version-1.8.0
 5bd7643387325cf0c080ba22fba28e72dca5e07d cubicweb-comment-debian-version-1.8.0-1
+a6f4c93f4fb79a4279e33bef4bda001544cd472c cubicweb-comment-version-1.8.1
+a0d092900c13464389c0d45ea500dc1b5f4f3319 cubicweb-comment-debian-version-1.8.1-1

__pkginfo__.py

@@ -4,7 +4,7 @@
 modname = 'comment'
 distname = "cubicweb-%s" % modname
 
-numversion = (1, 8, 0)
+numversion = (1, 8, 1)
 version = '.'.join(str(num) for num in numversion)
 
 license = 'LGPL'

debian/changelog

+cubicweb-comment (1.8.1-1) unstable; urgency=low
+
+  * new upstream release
+
+ -- Sylvain Thénault <sylvain.thenault@logilab.fr>  Mon, 26 Sep 2011 16:04:08 +0200
+
 cubicweb-comment (1.8.0-1) unstable; urgency=low
 
   * new upstream release

entities.py

@@ -7,6 +7,7 @@
 __docformat__ = "restructuredtext en"
 
 from logilab.common.textutils import normalize_text
+from rql import TypeResolverException
 
 from cubicweb.view import EntityView
 from cubicweb.selectors import is_instance
@@ -78,8 +79,12 @@
         cpath = itree.path()[1:]
         indentlevel = len(cpath) - 1
         for i, ceid in enumerate(cpath):
-            comment = self._cw.execute('Any C,T,D WHERE C creation_date D, C content T, C eid %(x)s',
-                                       {'x': ceid}, build_descr=True).get_entity(0, 0)
+            try:
+                comment = self._cw.execute('Any C,T,D WHERE C creation_date D, C content T, C eid %(x)s',
+                                           {'x': ceid}, build_descr=True).get_entity(0, 0)
+            except TypeResolverException:
+                # not a comment
+                break
             strings.append(comment.view('fulltext', indentlevel=indentlevel-i,
                                         withauthor=i!=indentlevel).strip() + '\n')
         strings.append(u'\n%s: %s' % (self._cw._('i18n_by_author_field'),