Merge pull request #401 from xispa/pr-2321

xispa · web-flow · commit 9f9db31face5 · 2017-11-23T12:24:17.000+01:00
PR2321 AR Add Copy of multiple ARs from different clients raises a Traceback in the background
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -15,6 +15,7 @@ Changelog
 
 **Fixed**
 
+- #401 PR-2321 AR Add Copy of multiple ARs from different clients raises a Traceback in the background
 - #397 Fix Issue-396: AttributeError: uid_catalog on AR publication
 
 
diff --git a/bika/lims/browser/analysisrequest/add2.py b/bika/lims/browser/analysisrequest/add2.py
@@ -1084,7 +1084,7 @@ def get_sampletype_info(self, obj):
 
         # client
         client = self.get_client()
-        client_uid = api.get_uid(client) if client else ""
+        client_uid = client and api.get_uid(client) or ""
 
         # sample matrix
         sample_matrix = obj.getSampleMatrix()

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ Changelog`
`15`	`15`
`16`	`16`	`Fixed`
`17`	`17`
	`18`	`+- #401 PR-2321 AR Add Copy of multiple ARs from different clients raises a Traceback in the background`
`18`	`19`	`- #397 Fix Issue-396: AttributeError: uid_catalog on AR publication`
`19`	`20`
`20`	`21`