From cdce1e58294865a71a931f1ef16ab7533c8f15bd Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 29 Aug 2013 09:43:01 +0000
Subject: [PATCH] SP-811 / BIS-517: Search Bug Fix, Login Feedback added.
SVN: 29690
---
.../1/as/webapps/newbrowser/html/js/UI/MainController.js | 5 ++---
.../1/as/webapps/newbrowser/html/js/UI/SampleTable.js | 6 +++++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
index bcfbbb1358f..63565b42ba3 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/MainController.js
@@ -31,7 +31,8 @@ $(document).ready(function() {
}
$('#login-form').submit(function() {
- openbisServer.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { enterApp(data) })
+ Util.blockUI();
+ openbisServer.login( $.trim($('#username').val()), $.trim($('#password').val()), function(data) { enterApp(data) })
});
openbisServer.ifRestoredSessionActive(function(data) { enterApp(data) });
@@ -64,8 +65,6 @@ function enterApp(data) {
profile.skeuomorphism = false;
$('body').css('background-image', 'none');
$('body').css('background-repeat', 'none');
-
- Util.blockUI();
$("#login-form-div").hide();
$("#main").show();
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
index bd6a2021038..5aa621fd5df 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/UI/SampleTable.js
@@ -215,7 +215,11 @@ function SampleTable(sampleTableId, profile, sampleTypeCode,inspectEnabled, enab
var propertyValue = d[propertyName];
if (propertyValue && searchRegexp.test(propertyValue)) {
if(propertyValue.indexOf("<root>") != -1) {
- return Util.getHTMLTableFromXML(propertyValue);
+ if(profile.getHTMLTableFromXML) {
+ return profile.getHTMLTableFromXML(propertyValue);
+ } else {
+ return propertyValue;
+ }
} else {
return propertyValue;
}
--
GitLab