From 5285ed2068d4f929e8524785c520859b31b1859a Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 18 Mar 2016 11:17:55 +0000
Subject: [PATCH] SSDM-3357 : Links on names and identifiers + use copy/paste
in experiments table.
SVN: 35937
---
.../html/js/views/DataGrid/ExperimentDataGridUtil.js | 9 +++++----
.../views/ExperimentTable/ExperimentTableController.js | 4 +---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
index ae53e20ad46..dd48cfb523d 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/ExperimentDataGridUtil.js
@@ -13,9 +13,7 @@ var ExperimentDataGridUtil = new function() {
isExportable: true,
sortable : true,
render : function(data) {
- var href = Util.getURLFor(mainController.sideMenu.getCurrentNodeId(), "showExperimentPageFromIdentifier", data.identifier);
- var link = $("<a>", { "href" : href, "class" : "browser-compatible-javascript-link" }).append(data.identifier);
- return link;
+ return FormUtil.getFormLink(data.identifier, "Experiment", data.identifier);;
},
filter : function(data, filter) {
return data.identifier.toLowerCase().indexOf(filter) !== -1;
@@ -33,7 +31,10 @@ var ExperimentDataGridUtil = new function() {
label : 'Name',
property : 'NAME',
isExportable: true,
- sortable : true
+ sortable : true,
+ render : function(data) {
+ return FormUtil.getFormLink(data.NAME, "Experiment", data.identifier);;
+ }
});
}
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
index 20f9d5749ab..6314740e79c 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/ExperimentTable/ExperimentTableController.js
@@ -71,9 +71,7 @@ function ExperimentTableController(parentController, title, project, showInProje
}
//Click event
- var rowClick = function(e) {
- mainController.changeView('showExperimentPageFromIdentifier', e.data.identifier);
- }
+ var rowClick = null;
//Create and display table
var dataGridController = ExperimentDataGridUtil.getExperimentDataGrid(selectedTypeCode, experiments, rowClick);
--
GitLab