From b2bface66de6e2fc83f8b93a3879c63a5358b0ac Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 18 Mar 2016 11:22:28 +0000
Subject: [PATCH] SSDM-3357 : Links on names and identifiers + use copy/paste
in samples table.
SVN: 35939
---
.../html/js/views/DataGrid/SampleDataGridUtil.js | 9 +++++----
.../html/js/views/SampleTable/SampleTableController.js | 7 +------
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 0ddf7a25aaf..22ec4285a8d 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -13,9 +13,7 @@ var SampleDataGridUtil = new function() {
isExportable: true,
sortable : true,
render : function(data) {
- var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showViewSamplePageFromPermId", data.permId);
- var link = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(data.identifier);
- return link;
+ return FormUtil.getFormLink(data.identifier, "Sample", data.permId);
},
filter : function(data, filter) {
return data.identifier.toLowerCase().indexOf(filter) !== -1;
@@ -33,7 +31,10 @@ var SampleDataGridUtil = new function() {
label : 'Name',
property : 'NAME',
isExportable: true,
- sortable : true
+ sortable : true,
+ render : function(data) {
+ return FormUtil.getFormLink(data.NAME, "Sample", data.permId);
+ }
});
}
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
index 6096c6738d2..1d4cbf4d885 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
@@ -82,13 +82,8 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
}
}
- //Click event
- var rowClick = function(e) {
- mainController.changeView('showViewSamplePageFromPermId', e.data.permId);
- }
-
//Create and display table
- var dataGridController = SampleDataGridUtil.getSampleDataGrid(selectedSampleTypeCode, samples, rowClick);
+ var dataGridController = SampleDataGridUtil.getSampleDataGrid(selectedSampleTypeCode, samples, null);
dataGridController.init(this._sampleTableView.getTableContainer());
}
}
--
GitLab