diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js index 4363731d9af04d48f03443dc78be86ac068efb64..8584269f6d818b7499c30bacc8ae5aef958dfd6b 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/server/ServerFacade.js @@ -721,7 +721,7 @@ function ServerFacade(openbisServer) { }; var localReference = this; - this.openbisServer.searchForSamplesWithFetchOptions(sampleCriteria, ["PROPERTIES"], function(data) { + this.openbisServer.searchForSamplesWithFetchOptions(sampleCriteria, ["PROPERTIES", "PARENTS"], function(data) { callbackFunction(localReference.getInitializedSamples(data.result)); }); } diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js index 3f70e06ae9c67567a3da8c24b71f125f68c6229a..b899ba345e7a418d3cbd35379f20d94368757a5a 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js @@ -92,6 +92,11 @@ function SampleTableController(parentController, title, experimentIdentifier) { property : 'default_space', isExportable: true, sortable : true + }, { + label : 'Parents', + property : 'parents', + isExportable: true, + sortable : true }, { label : 'Experiment', property : 'experiment', @@ -244,6 +249,19 @@ function SampleTableController(parentController, title, experimentIdentifier) { var propertyCode = propertyCodes[pIdx]; sampleModel[propertyCode] = sample.properties[propertyCode]; } + + var parents = ""; + if(sample.parents) { + for (var paIdx = 0; paIdx < sample.parents.length; paIdx++) { + if(paIdx !== 0) { + ", "; + } + parents += sample.parents[paIdx].identifier; + } + } + + sampleModel['parents'] = parents; + dataList.push(sampleModel); } callback(dataList);