From dacc69ea5cc3a35faf05a95e8976cd9a1fdec621 Mon Sep 17 00:00:00 2001 From: NavaL Date: Fri, 22 Jan 2016 16:00:17 +0100 Subject: re-introduced logout functionality for multi-user Issue #576 --- service/pixelated/resources/root_resource.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'service/pixelated/resources/root_resource.py') diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index a1ed876e..61df0f39 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -23,6 +23,7 @@ from pixelated.resources.contacts_resource import ContactsResource from pixelated.resources.features_resource import FeaturesResource from pixelated.resources.feedback_resource import FeedbackResource from pixelated.resources.login_resource import LoginResource +from pixelated.resources.logout_resource import LogoutResource from pixelated.resources.user_settings_resource import UserSettingsResource from pixelated.resources.mail_resource import MailResource from pixelated.resources.mails_resource import MailsResource @@ -60,13 +61,14 @@ class RootResource(BaseResource): self.putChild('keys', KeysResource(self._services_factory)) self.putChild(AttachmentsResource.BASE_URL, AttachmentsResource(self._services_factory)) self.putChild('contacts', ContactsResource(self._services_factory)) - self.putChild('features', FeaturesResource()) + self.putChild('features', FeaturesResource(portal)) self.putChild('tags', TagsResource(self._services_factory)) self.putChild('mails', MailsResource(self._services_factory)) self.putChild('mail', MailResource(self._services_factory)) self.putChild('feedback', FeedbackResource(self._services_factory)) self.putChild('user-settings', UserSettingsResource(self._services_factory)) - self.putChild('login', LoginResource(self._services_factory, portal)) + self.putChild(LoginResource.BASE_URL, LoginResource(self._services_factory, portal)) + self.putChild(LogoutResource.BASE_URL, LogoutResource(self._services_factory)) self._mode = MODE_RUNNING -- cgit v1.2.3