Revert r35608 since this was breaking the comment moderation bulk actions. The BulkActionsView expects the absolute path of the comments without the portal url (e.g. '/plone/doc1/++conversation++default/1285346769126020'). This fixes https://dev.plone.org/plone/ticket/11156.

svn path=/plone.app.discussion/trunk/; revision=40227

CHANGES.txt

@@ -4,6 +4,12 @@ Changelog
 1.0b8 (unreleased)
 ------------------
 
+- Revert r35608 since this was breaking the comment moderation bulk actions. 
+  The BulkActionsView expects the absolute path of the comments without the 
+  portal url (e.g. '/plone/doc1/++conversation++default/1285346769126020'). 
+  This fixes https://dev.plone.org/plone/ticket/11156.
+  [timo]
+
 - Use "(function($) { /* some code that uses $ */ })(jQuery)" instead of
   "$(document).ready(function(){ /* some code that uses $ */ });" to invoke 
   jQuery code.

plone/app/discussion/browser/moderation.pt

@@ -96,7 +96,7 @@
                                            class="noborder"
                                            name="paths:list" id="#"
                                            value="#"
-                                           tal:attributes="value   python:view.item_path(item);
+                                           tal:attributes="value   item/getPath;
                                                            id      string:cb_${item/id};
                                                            checked item/checked|nothing;
                                                            alt     string:Select ${item/Title};

plone/app/discussion/browser/moderation.py

@@ -49,11 +49,6 @@ class View(BrowserView):
 
         context = aq_inner(self.context)
 
-        # Help for path mangling
-        portal_url = getToolByName(context, 'portal_url')
-        self.portal_url = portal_url()
-        self.portal_path = portal_url.getPortalPath()
-
         catalog = getToolByName(context, 'portal_catalog')
 
         self.comments = catalog(object_provides=IComment.__identifier__,
@@ -77,11 +72,6 @@ class View(BrowserView):
         else:
             return False
 
-    def item_path(self, item):
-        # Path mangling to support virtual hosting
-        path = item.getPath()[len(self.portal_path):]
-        return self.portal_url + path
-
 
 class DeleteComment(BrowserView):
     """Delete a comment from a conversation