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 dd22ac405e5b09bb6428cd55ac177d1db39fff96..7130401d48b4152c5ab072d883d220cfa25e71be 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 @@ -83,16 +83,24 @@ function SampleTableController(parentController, title, experimentIdentifier) { //Fill Columns model var columns = [ { - label : 'Code', - property : 'code', + label : 'Identifier', + property : 'identifier', + isExportable: true, + sortable : true + }, { + label : 'Space', + property : 'default_space', + isExportable: true, sortable : true }, { label : 'Experiment', property : 'experiment', + isExportable: true, sortable : true }, { label : 'Preview', property : 'preview', + isExportable: false, sortable : false, render : function(data) { var previewContainer = $("<div>"); @@ -130,6 +138,7 @@ function SampleTableController(parentController, title, experimentIdentifier) { columns.push({ label : propertyCodesDisplayNames[idx], property : propertyCodes[idx], + isExportable: true, sortable : true }); } @@ -193,7 +202,7 @@ function SampleTableController(parentController, title, experimentIdentifier) { var dataList = []; for(var sIdx = 0; sIdx < samples.length; sIdx++) { var sample = samples[sIdx]; - var sampleModel = { 'code' : sample.code, 'permId' : sample.permId, 'experiment' : sample.experimentIdentifierOrNull }; + var sampleModel = { 'identifier' : sample.code, 'default_space' : sample.spaceCode, 'permId' : sample.permId, 'experiment' : sample.experimentIdentifierOrNull }; for (var pIdx = 0; pIdx < propertyCodes.length; pIdx++) { var propertyCode = propertyCodes[pIdx]; var propertyType = profile.isPropertyPressent(sampleType, propertyCode); diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/lib/grid/js/Grid.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/lib/grid/js/Grid.js index 9e63af145bf7b3f1bbbf5641248ceee67817d3da..da81fb46358b9bd49777f12798bae0036b8cfe97 100644 --- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/lib/grid/js/Grid.js +++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/lib/grid/js/Grid.js @@ -168,12 +168,16 @@ $.extend(Grid.prototype, { var prefix = ""; if(isAllColumnsOrVisible) { thisGrid.columns.forEach(function(head) { - headings.push(head.property); + if(head.isExportable === true || head.isExportable === undefined) { + headings.push(head.property); + } }); prefix += "AllColumns"; } else { thisGrid.getVisibleColumns().forEach(function(head) { - headings.push(head.property); + if(head.isExportable === true || head.isExportable === undefined) { + headings.push(head.property); + } }); prefix += "VisibleColumns"; }