From 19d2a76cc56b56643f1549a83b8c48729fb2a53d Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 6 Mar 2014 16:57:56 +0000
Subject: [PATCH] BIS-604 / SP-1211: ELN UI - Hierarchical View (Hierarchy/Edit
 sample from table buttons swapped for better defaults)

SVN: 30826
---
 .../newbrowser/html/img/hierarchy-icon.png       | Bin 0 -> 7629 bytes
 .../newbrowser/html/js/views/SampleTable.js      |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/img/hierarchy-icon.png

diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/img/hierarchy-icon.png b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/img/hierarchy-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..14d79935b79c6d5b7844c3dc74ed9a700bc58f5f
GIT binary patch
literal 7629
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
K%bQ>LpZH(d<9?a|

literal 0
HcmV?d00001

diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
index c34c45c30f5..e880251524b 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable.js
@@ -382,7 +382,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
 			}
 		} else {
 			onClickFunction = function(sample) {
-				mainController.changeView("showSampleHierarchyPage", sample.permId); //TO-DO : Fix Global Access
+				mainController.changeView("showViewSamplePageFromPermId", sample.permId); //TO-DO : Fix Global Access
 			}
 		}
 	
@@ -452,7 +452,7 @@ function SampleTable(serverFacade, sampleTableId, profile, sampleTypeCode, inspe
 				}
 				
 				if(localReference.enableEdit) {
-					tableFields[tableFields.length] = "<a class='btn' href=\"javascript:mainController.changeView('showViewSamplePageFromPermId','"+sample.permId+"');\"><i class='icon-edit'></i></a>";
+					tableFields[tableFields.length] = "<a class='btn' href=\"javascript:mainController.changeView('showSampleHierarchyPage','"+sample.permId+"');\"><img src='./img/hierarchy-icon.png' style='width:16px; height:22px;' /></a>";
 					tableFields[tableFields.length] = "";
 				} else {
 					tableFields[tableFields.length] = "";
-- 
GitLab