User with "Analyst" role cannot submit analyses from worksheet

CHANGES.rst

@@ -18,6 +18,7 @@ Changelog
 
 **Fixed**
 
+- #1475 User with "Analyst" role cannot submit analyses from worksheet
 - #1474 Adding Control Reference to Worksheet causes print fail
 - #1473 Hidden settings of analysis services lost on Sample creation
 - #1472 Secondary samples - removal of analysis profile not possible

bika/lims/content/worksheet.py

@@ -207,6 +207,10 @@ def addAnalysis(self, analysis, position=None):
             if method and analysis.isMethodAllowed(method):
                 analysis.setMethod(method)
 
+        # Assign the worksheet's analyst to the analysis
+        # https://github.com/senaite/senaite.core/issues/1409
+        analysis.setAnalyst(self.getAnalyst())
+
         # Transition analysis to "assigned"
         actions_pool = ActionHandlerPool.get_instance()
         actions_pool.queue_pool()

bika/lims/workflow/analysis/guards.py

@@ -18,14 +18,16 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
+from plone.memoize.request import cache
+
 from bika.lims import api
 from bika.lims import logger
 from bika.lims import workflow as wf
+from bika.lims.api import security
 from bika.lims.interfaces import ISubmitted
 from bika.lims.interfaces import IVerified
 from bika.lims.interfaces import IWorksheet
 from bika.lims.interfaces.analysis import IRequestAnalysis
-from plone.memoize.request import cache
 
 
 def is_worksheet_context():
@@ -136,10 +138,11 @@ def guard_submit(analysis):
     if not analysis.bika_setup.getAllowToSubmitNotAssigned():
         if not user_has_super_roles():
             # Cannot submit if unassigned
-            if not analysis.getAnalyst():
+            analyst = analysis.getAnalyst()
+            if not analyst:
                 return False
             # Cannot submit if assigned analyst is not the current user
-            if analysis.getAnalyst() != api.get_current_user().getId():
+            if analyst != security.get_user_id():
                 return False
 
     # Cannot submit unless all dependencies are submitted or can be submitted