Skip to content

Commit

Permalink
Merge pull request #60 from 4teamwork/mle-fix-anon-export
Browse files Browse the repository at this point in the history
Don't use session storage anymore - does not work with plone 5 for anonymous users
  • Loading branch information
Mathias Leimgruber committed Feb 3, 2020
2 parents 878dc60 + f7dfc12 commit b42c2fc
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/HISTORY.txt
Expand Up @@ -4,7 +4,7 @@ Changelog
1.6.7 (unreleased)
------------------

- Nothing changed yet.
- Don't use session storage anymore - does not work with plone 5 for anonymous users. [mathias.leimgruber]


1.6.6 (2020-01-17)
Expand Down
8 changes: 6 additions & 2 deletions ftw/pdfgenerator/browser/views.py
@@ -1,7 +1,8 @@
from Products.Five import BrowserView
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from ftw.pdfgenerator.interfaces import DEBUG_MODE_SESSION_KEY
from ftw.pdfgenerator.interfaces import IPDFAssembler
from plone import api
from Products.Five import BrowserView
from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
from zope.component import getMultiAdapter


Expand Down Expand Up @@ -31,6 +32,9 @@ def allow_alternate_output(self):
if user.has_permission('cmf.ManagePortal', self.context):
return True

elif api.user.is_anonymous():
return False

elif self.request.SESSION.get(DEBUG_MODE_SESSION_KEY, False):
return True

Expand Down
22 changes: 19 additions & 3 deletions ftw/pdfgenerator/tests/test_export.py
Expand Up @@ -100,18 +100,32 @@ def test_allow_alternate_output_True(self):
aspdf = ExportPDFView(context, request)
self.assertEqual(aspdf.allow_alternate_output(), True)

def test_allow_alternate_output_False(self):
@patch('plone.api.user.is_anonymous')
def test_allow_alternate_output_False(self, is_anonymous):
is_anonymous.return_value = False

context, request = self.mock_allow_alternate_output(False)

aspdf = ExportPDFView(context, request)
self.assertEqual(aspdf.allow_alternate_output(), False)

def test_allow_alternate_output_in_debug_mode_False(self):
@patch('plone.api.user.is_anonymous')
def test_allow_alternate_output_in_debug_mode_False(self, is_anonymous):
is_anonymous.return_value = False
context, request = self.mock_allow_alternate_output(False, True)

aspdf = ExportPDFView(context, request)
self.assertEqual(aspdf.allow_alternate_output(), True)

@patch('plone.api.user.is_anonymous')
def test_do_not_allow_alternate_output_for_anonymous(self, is_anonymous):
is_anonymous.return_value = True

context, request = self.mock_allow_alternate_output(False)

aspdf = ExportPDFView(context, request)
self.assertEqual(aspdf.allow_alternate_output(), False)

def test_call_renders_template_if_admin(self):
context, request = self.mock_allow_alternate_output(True)

Expand All @@ -123,7 +137,9 @@ def test_call_renders_template_if_admin(self):
aspdf = ExportPDFView(context, request)
self.assertEqual(aspdf(), 'rendered html')

def test_call_exports_if_not_admin(self):
@patch('plone.api.user.is_anonymous')
def test_call_exports_if_not_admin(self, is_anonymous):
is_anonymous.return_value = False
context, request = self.mock_allow_alternate_output(False)
request_params = {
'submitted': True,
Expand Down
1 change: 1 addition & 0 deletions setup.py
Expand Up @@ -58,6 +58,7 @@
# Plone
'Products.Archetypes',
'Products.CMFCore',
'plone.api',

'Mako',
'BeautifulSoup!=4.0b',
Expand Down

0 comments on commit b42c2fc

Please sign in to comment.