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
This commit is contained in:
parent
2ff95fe847
commit
ad99e45203
@ -4,6 +4,12 @@ Changelog
|
|||||||
1.0b8 (unreleased)
|
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
|
- Use "(function($) { /* some code that uses $ */ })(jQuery)" instead of
|
||||||
"$(document).ready(function(){ /* some code that uses $ */ });" to invoke
|
"$(document).ready(function(){ /* some code that uses $ */ });" to invoke
|
||||||
jQuery code.
|
jQuery code.
|
||||||
|
@ -96,7 +96,7 @@
|
|||||||
class="noborder"
|
class="noborder"
|
||||||
name="paths:list" id="#"
|
name="paths:list" id="#"
|
||||||
value="#"
|
value="#"
|
||||||
tal:attributes="value python:view.item_path(item);
|
tal:attributes="value item/getPath;
|
||||||
id string:cb_${item/id};
|
id string:cb_${item/id};
|
||||||
checked item/checked|nothing;
|
checked item/checked|nothing;
|
||||||
alt string:Select ${item/Title};
|
alt string:Select ${item/Title};
|
||||||
|
@ -48,11 +48,6 @@ class View(BrowserView):
|
|||||||
self.request.set('disable_border', True)
|
self.request.set('disable_border', True)
|
||||||
|
|
||||||
context = aq_inner(self.context)
|
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')
|
catalog = getToolByName(context, 'portal_catalog')
|
||||||
|
|
||||||
@ -76,11 +71,6 @@ class View(BrowserView):
|
|||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
return False
|
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):
|
class DeleteComment(BrowserView):
|
||||||
|
Loading…
Reference in New Issue
Block a user