From cba156f479222cf6edb954e0b3189e42afd288c8 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 25 Feb 2016 10:42:29 +0000
Subject: [PATCH] SSDM-3212 : Fixing table loading when using V3 Dropbox.
SVN: 35734
---
.../1/as/webapps/eln-lims/html/js/server/ServerFacade.js | 9 +++++++++
.../html/js/views/SampleTable/SampleTableView.js | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
index 7f3dc6d4e85..77e03e87789 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/server/ServerFacade.js
@@ -936,6 +936,15 @@ function ServerFacade(openbisServer) {
}, callbackFunction);
}
+ this.searchByTypeWithParents = function(sampleType, callbackFunction)
+ {
+ this.searchSamples({
+ "sampleTypeCode" : sampleType,
+ "withProperties" : true,
+ "withParents" : true,
+ }, callbackFunction);
+ }
+
this.searchWithType = function(sampleType, sampleCode, includeAncestorsAndDescendants, callbackFunction)
{
this.searchSamples({
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
index 63d8a619478..f0bfa35dd98 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableView.js
@@ -140,7 +140,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
$sampleTypesSelector.change(function() {
var sampleTypeToShow = $(this).val();
Util.blockUI();
- mainController.serverFacade.searchWithType(sampleTypeToShow, null, true, function(samples) {
+ mainController.serverFacade.searchByTypeWithParents(sampleTypeToShow, function(samples) {
_this._sampleTableModel.allSamples = samples;
_this._sampleTableController._reloadTableWithSampleType(sampleTypeToShow);
Util.unblockUI();
--
GitLab