From f37ae23dc3c4d6cde41b6787172e63ed5cf43d06 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 2 Apr 2015 08:49:52 +0000
Subject: [PATCH] SSDM-1683: button for sample hierary table: moved in sample
form view and added to operations column in sample browser
SVN: 33775
---
.../html/js/views/SampleForm/SampleFormView.js | 18 +++++++++---------
.../views/SampleTable/SampleTableController.js | 6 ++++++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
index 829a75e8a46..4f3c0b53003 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js
@@ -73,6 +73,15 @@ function SampleFormView(sampleFormController, sampleFormModel) {
//Hierarchy
$formTitle.append(" ");
$formTitle.append(FormUtil.getHierarchyButton(this._sampleFormModel.sample.permId));
+ //Table hierarchy
+ $formTitle.append(" ");
+ var $tableHierarchyButton = $("<a>", { 'class' : 'btn btn-default'} )
+ .append($('<img>', { 'src' : './img/hierarchy-icon.png', 'style' : 'width:16px; height:17px;' }))
+ .append(' Table');
+ $tableHierarchyButton.click(function () {
+ mainController.changeView('showSampleHierarchyTablePage', _this._sampleFormModel.sample.permId);
+ });
+ $formTitle.append($tableHierarchyButton);
//Copy
$formTitle.append(" ");
var $copyButton = $("<a>", { 'class' : 'btn btn-default'} )
@@ -99,15 +108,6 @@ function SampleFormView(sampleFormController, sampleFormModel) {
$formTitle.append($editButton);
}
- //Table hierarchy
- $formTitle.append(" ");
- var $tableHierarchyButton = $("<a>", { 'class' : 'btn btn-default'} )
- .append($('<img>', { 'src' : './img/hierarchy-icon.png', 'style' : 'width:16px; height:17px;' }))
- .append(' Table');
- $tableHierarchyButton.click(function () {
- mainController.changeView('showSampleHierarchyTablePage', _this._sampleFormModel.sample.permId);
- });
- $formTitle.append($tableHierarchyButton);
}
$formColumn.append($formTitle);
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 b899ba345e7..78f905446e0 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
@@ -229,6 +229,12 @@ function SampleTableController(parentController, title, experimentIdentifier) {
});
$list.append($openHierarchy);
+ var $openHierarchy = $("<li>", { 'role' : 'presentation' }).append($("<a>", {'title' : 'Open Hierarchy Table'}).append("Open Hierarchy Table"));
+ $openHierarchy.click(function(e) {
+ mainController.changeView('showSampleHierarchyTablePage', data.permId);
+ });
+ $list.append($openHierarchy);
+
return $dropDownMenu;
},
filter : function(data, filter) {
--
GitLab