Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Error: Labclerks viewing verified worksheets #1479

Merged
merged 5 commits into from
Nov 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions bika/lims/browser/worksheet/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
/>

Expand All @@ -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"
/>

Expand Down Expand Up @@ -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"
/>

Expand All @@ -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"
/>

Expand Down
29 changes: 9 additions & 20 deletions bika/lims/browser/worksheet/views/results.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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)

Expand Down Expand Up @@ -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
Expand Down