All Samples are listed inside Case context (#103)

* Link to Add Case inside client context is wrong

Should redirect to the base /batches folder. Otherwise, the case
is created inside the Client.

* Update changes.rst

Author: xispa

CHANGES.rst

@@ -18,6 +18,7 @@ Changelog
 
 **Fixed**
 
+- #102 All Samples are listed inside Case context
 - #99 Traceback when publishing health results from inside a client
 - #97 Traceback accessing Doctor samples when user is not Manager, LabManager or LabClerk
 - #82 Inconsistent behavior with health' skins priority over core's

bika/health/browser/batch/samples.py

@@ -5,28 +5,17 @@
 # Copyright 2018 by it's authors.
 # Some rights reserved. See LICENSE.rst, CONTRIBUTORS.rst.
 
-from Products.CMFCore.utils import getToolByName
+from bika.lims import api
 from bika.health.browser.samples.folder_view import SamplesView
 
 
 class BatchSamplesView(SamplesView):
+
     def __init__(self, context, request):
         super(BatchSamplesView, self).__init__(context, request)
         self.view_url = self.context.absolute_url() + "/samples"
-        if 'path' in self.contentFilter:
-            del(self.contentFilter['path'])
-
-    def contentsMethod(self, contentFilter):
-        tool = getToolByName(self.context, self.catalog)
-        state = [x for x in self.review_states if x['id'] == self.review_state['id']][0]
-        for k, v in state['contentFilter'].items():
-            self.contentFilter[k] = v
-        tool_samples = tool(contentFilter)
-        samples = {}
-        for sample in (p.getObject() for p in tool_samples):
-            for ar in sample.getAnalysisRequests():
-                batch = ar.getBatch()
-                batch_uid = batch.UID() if batch else ''
-                if batch_uid == self.context.UID():
-                    samples[sample.getId()] = sample
-        return samples.values()
+        self.contentFilter = {'portal_type': 'Sample',
+                              'getBatchUIDs': api.get_uid(self.context),
+                              'sort_on': 'created',
+                              'sort_order': 'reverse',
+                              'cancellation_state':'active'}