Merge branch 'master' of https://github.com/plone-ve/plone.app.discussion
This commit is contained in:
commit
71bb802118
@ -4,7 +4,8 @@ Changelog
|
||||
2.4.3 (unreleased)
|
||||
------------------
|
||||
|
||||
- Nothing changed yet.
|
||||
- Only use edit overlay if available for editing comments
|
||||
[vangheem]
|
||||
|
||||
|
||||
2.4.2 (2015-05-04)
|
||||
|
@ -9,7 +9,8 @@
|
||||
has_replies python:view.has_replies(canReview);
|
||||
showCommenterImage view/show_commenter_image;
|
||||
errors options/state/getErrors|nothing;
|
||||
wtool context/@@plone_tools/workflow;"
|
||||
wtool context/@@plone_tools/workflow;
|
||||
auth_token context/@@authenticator/token|nothing"
|
||||
tal:condition="python:isDiscussionAllowed or has_replies"
|
||||
i18n:domain="plone">
|
||||
|
||||
@ -115,19 +116,26 @@
|
||||
/>
|
||||
</form>
|
||||
|
||||
<form name="edit"
|
||||
action=""
|
||||
method="get"
|
||||
class="commentactionsform"
|
||||
tal:condition="python:isEditCommentAllowed and canEdit"
|
||||
tal:attributes="action string:${reply/absolute_url}/@@edit-comment">
|
||||
<input name="form.button.EditComment"
|
||||
class="context"
|
||||
type="submit"
|
||||
value="Edit"
|
||||
i18n:attributes="value label_edit;"
|
||||
/>
|
||||
</form>
|
||||
<tal:edit tal:condition="python:isEditCommentAllowed and canEdit">
|
||||
<!-- plone 5 will have auth_token available
|
||||
so we'll use modal pattern -->
|
||||
<a class="commentactionsform pat-plone-modal"
|
||||
tal:condition="auth_token"
|
||||
tal:attributes="href string:${reply/absolute_url}/@@edit-comment?_authenticator=${auth_token}">Edit</a>
|
||||
<form name="edit"
|
||||
action=""
|
||||
method="get"
|
||||
class="commentactionsform"
|
||||
tal:condition="not: auth_token"
|
||||
tal:attributes="action string:${reply/absolute_url}/@@edit-comment">
|
||||
<input name="form.button.EditComment"
|
||||
class="context"
|
||||
type="submit"
|
||||
value="Edit"
|
||||
i18n:attributes="value label_edit;"
|
||||
/>
|
||||
</form>
|
||||
</tal:edit>
|
||||
|
||||
|
||||
<!-- Workflow actions (e.g. 'publish') -->
|
||||
|
@ -189,12 +189,14 @@ require([ // jshint ignore:line
|
||||
/**********************************************************************
|
||||
* Edit a comment
|
||||
**********************************************************************/
|
||||
$('form[name="edit"]').prepOverlay({
|
||||
cssclass: 'overlay-edit-comment',
|
||||
width: '60%',
|
||||
subtype: 'ajax',
|
||||
filter: '#content>*'
|
||||
});
|
||||
if($.fn.prepOverlay){
|
||||
$('form[name="edit"]').prepOverlay({
|
||||
cssclass: 'overlay-edit-comment',
|
||||
width: '60%',
|
||||
subtype: 'ajax',
|
||||
filter: '#content>*'
|
||||
});
|
||||
}
|
||||
|
||||
/**********************************************************************
|
||||
* Delete a comment and its answers.
|
||||
|
@ -269,14 +269,15 @@ Use the Plone control panel to enable comment editing.
|
||||
|
||||
Extract the edit comment url from the first "edit comment" button
|
||||
|
||||
>>> from Products.CMFPlone import __version__
|
||||
>>> browser.open(urldoc1)
|
||||
>>> form = browser.getForm(name='edit', index=0)
|
||||
>>> '@@edit-comment' in form.action
|
||||
>>> url = __version__[0] == '5' and browser.getLink(url='@@edit-comment').url or browser.getForm(name='edit', index=0).action
|
||||
>>> '@@edit-comment' in url
|
||||
True
|
||||
|
||||
Open the edit comment view
|
||||
|
||||
>>> browser.open(form.action)
|
||||
>>> browser.open(url)
|
||||
>>> ctrl = browser.getControl('Comment')
|
||||
>>> ctrl.value
|
||||
'Comment from admin'
|
||||
@ -298,10 +299,10 @@ Check it ain't so.
|
||||
|
||||
Opening the edit comment view, then cancel, does nothing.
|
||||
|
||||
>>> form = browser.getForm(name='edit', index=0)
|
||||
>>> '@@edit-comment' in form.action
|
||||
>>> url = __version__[0] == '5' and browser.getLink(url='@@edit-comment').url or browser.getForm(name='edit', index=0).action
|
||||
>>> '@@edit-comment' in url
|
||||
True
|
||||
>>> browser.open(form.action)
|
||||
>>> browser.open(url)
|
||||
>>> browser.getControl('Cancel').click()
|
||||
>>> browser.url.startswith('http://nohost/plone/doc1')
|
||||
True
|
||||
|
Loading…
Reference in New Issue
Block a user