diff --git a/CHANGES.rst b/CHANGES.rst index 4bb7806e93..d0433fe063 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -18,6 +18,7 @@ Changelog **Fixed** +- #1479 Fixed too many redirects error: Labclerks viewing verified worksheets - #1480 Worksheet removal results in 404 - #1475 User with "Analyst" role cannot submit analyses from worksheet - #1474 Adding Control Reference to Worksheet causes print fail diff --git a/bika/lims/browser/worksheet/configure.zcml b/bika/lims/browser/worksheet/configure.zcml index 94d57bb4ce..2f7187f6d8 100644 --- a/bika/lims/browser/worksheet/configure.zcml +++ b/bika/lims/browser/worksheet/configure.zcml @@ -42,7 +42,7 @@ for="bika.lims.interfaces.IWorksheet" name="analyses_classic_view" class="bika.lims.browser.worksheet.views.AnalysesView" - permission="senaite.core.permissions.EditWorksheet" + permission="senaite.core.permissions.ViewResults" layer="bika.lims.interfaces.IBikaLIMS" /> @@ -51,7 +51,7 @@ for="bika.lims.interfaces.IWorksheet" name="analyses_transposed_view" class="bika.lims.browser.worksheet.views.AnalysesTransposedView" - permission="senaite.core.permissions.EditWorksheet" + permission="senaite.core.permissions.ViewResults" layer="bika.lims.interfaces.IBikaLIMS" /> @@ -83,7 +83,7 @@ for="bika.lims.interfaces.IWorksheet" name="export" class="bika.lims.browser.worksheet.views.ExportView" - permission="senaite.core.permissions.EditWorksheet" + permission="senaite.core.permissions.ViewResults" layer="bika.lims.interfaces.IBikaLIMS" /> @@ -99,7 +99,7 @@ for="bika.lims.interfaces.IWorksheet" name="print" class="bika.lims.browser.worksheet.views.PrintView" - permission="senaite.core.permissions.EditWorksheet" + permission="senaite.core.permissions.ViewResults" layer="bika.lims.interfaces.IBikaLIMS" /> diff --git a/bika/lims/browser/worksheet/views/results.py b/bika/lims/browser/worksheet/views/results.py index 0b93c3a0a4..9e5110aa93 100644 --- a/bika/lims/browser/worksheet/views/results.py +++ b/bika/lims/browser/worksheet/views/results.py @@ -18,21 +18,21 @@ # Copyright 2018-2019 by it's authors. # Some rights reserved, see README and LICENSE. -from bika.lims import api -from bika.lims import bikaMessageFactory as _ -from bika.lims.browser import BrowserView -from bika.lims.browser.worksheet.tools import showRejectionMessage -from bika.lims.config import WORKSHEET_LAYOUT_OPTIONS -from bika.lims.utils import getUsers -from plone.app.layout.globals.interfaces import IViewView from Products.Archetypes.public import DisplayList from Products.CMFCore.utils import getToolByName from Products.CMFPlone.utils import safe_unicode from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile -from zope.interface import implements +from plone.app.layout.globals.interfaces import IViewView from plone.memoize import view -from bika.lims.permissions import EditWorksheet +from zope.interface import implements + +from bika.lims import api +from bika.lims import bikaMessageFactory as _ +from bika.lims.browser import BrowserView +from bika.lims.browser.worksheet.tools import showRejectionMessage +from bika.lims.config import WORKSHEET_LAYOUT_OPTIONS from bika.lims.permissions import ManageWorksheets +from bika.lims.utils import getUsers class ManageResultsView(BrowserView): @@ -51,10 +51,6 @@ def __init__(self, context, request): self.layout_displaylist = WORKSHEET_LAYOUT_OPTIONS def __call__(self): - # TODO: Refactor Worfklow - if not self.is_edit_allowed(): - redirect_url = api.get_url(self.context) - return self.request.response.redirect(redirect_url) # TODO: Refactor this function call showRejectionMessage(self.context) @@ -99,13 +95,6 @@ def get_instrument_title(self): return "" return api.get_title(instrument) - @view.memoize - def is_edit_allowed(self): - """Check if edit is allowed - """ - checkPermission = self.context.portal_membership.checkPermission - return checkPermission(EditWorksheet, self.context) - @view.memoize def is_manage_allowed(self): """Check if manage is allowed