Skip to content

Commit

Permalink
Merge pull request #44 from plone/maintain-clipboard-contents
Browse files Browse the repository at this point in the history
Do not clear clipboard when pasting content
  • Loading branch information
vangheem committed Jul 26, 2015
2 parents a91f794 + 35ba8dc commit 05be65c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGES.rst
Expand Up @@ -4,7 +4,11 @@ Changelog
3.0.8 (unreleased)
------------------

- Do not clear clipboard when pasting content
[vangheem]

- Fix i18n of '"title" has already been deleted'.

- When clicking cancel on the delete_confirmation got to the view_url.
[ale-rt]

Expand Down
6 changes: 0 additions & 6 deletions plone/app/content/browser/contents/paste.py
@@ -1,6 +1,5 @@
# -*- coding: utf-8 -*-
from AccessControl import Unauthorized
from OFS.CopySupport import cookie_path
from Products.CMFPlone import PloneMessageFactory as _
from ZODB.POSException import ConflictError
from plone.app.content.browser.contents import ContentsBaseAction
Expand Down Expand Up @@ -53,9 +52,4 @@ def __call__(self):
_(u'You are not authorized to paste ${title} here.',
mapping={u'title': self.objectTitle(self.dest)}))

resp = self.request.response
resp.setCookie('__cp', 'deleted',
path='%s' % cookie_path(self.request),
expires='Wed, 31-Dec-97 23:59:59 GMT')
self.request['__cp'] = None
return self.message()

0 comments on commit 05be65c

Please sign in to comment.