diff --git a/src/ploneintranet/workspace/browser/viewlets.py b/src/ploneintranet/workspace/browser/viewlets.py index 7694b21..49ed17a 100644 --- a/src/ploneintranet/workspace/browser/viewlets.py +++ b/src/ploneintranet/workspace/browser/viewlets.py @@ -2,6 +2,8 @@ from plone import api from plone.app.layout.viewlets import ViewletBase +from ploneintranet.workspace.browser.forms import particip_vocab + class JoinViewlet(ViewletBase): """ Allows users to join a self-joining workspace """ @@ -56,4 +58,6 @@ def visible(self): return url.endswith('@@sharing') def participant_policy(self): - return self.context.participant_policy.title() + key = self.context.participant_policy + term = particip_vocab.by_value.get(key) + return term.title diff --git a/src/ploneintranet/workspace/tests/test_viewlets.py b/src/ploneintranet/workspace/tests/test_viewlets.py index 9d4e7a2..0d6f9bf 100644 --- a/src/ploneintranet/workspace/tests/test_viewlets.py +++ b/src/ploneintranet/workspace/tests/test_viewlets.py @@ -1,7 +1,9 @@ from collective.workspace.interfaces import IWorkspace from plone import api +from ploneintranet.workspace.browser.forms import particip_vocab from ploneintranet.workspace.browser.viewlets import JoinViewlet +from ploneintranet.workspace.browser.viewlets import SharingViewlet from ploneintranet.workspace.tests.base import BaseTestCase @@ -56,3 +58,24 @@ def test_viewlet(self): viewlet = JoinViewlet(self.folder, self.request, None, None) url = "%s/%s" % (self.workspace.absolute_url(), "joinme") self.assertEqual(viewlet.join_url(), url) + + +class TestSharingViewlet(BaseTestCase): + + def setUp(self): + super(TestSharingViewlet, self).setUp() + self.portal = self.layer["portal"] + self.request = self.layer["request"] + + self.login_as_portal_owner() + self.workspace = api.content.create( + self.portal, + "ploneintranet.workspace.workspacefolder", + "demo-workspace", + title="Demo Workspace") + + def test_viewlet_message_is_correct(self): + viewlet = SharingViewlet(self.workspace, self.request, None, None) + key = self.workspace.participant_policy + term = particip_vocab.by_value.get(key) + self.assertEqual(viewlet.participant_policy(), term.title)