From aa8e6df3bd000818d93f83c16f077d98696adb05 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 10 Oct 2014 09:36:18 +0000
Subject: [PATCH] SSDM-1038 ELN UI - PAPER - Support Domain-specific searching
SVN: 32576
---
.../webapps/newbrowser/html/js/controllers/MainController.js | 3 ++-
.../1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
index bea028c9050..f1552a0aece 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
@@ -489,6 +489,7 @@ function MainController(profile) {
$("#search").addClass("search-query-searching");
var searchDomain = $("#prefix-selected-search-domain").attr("selected-name");
+ var searchDomainLabel = $("#prefix-selected-search-domain").attr("selected-label");
if(!searchDomain || searchDomain === profile.getSearchDomains()[0].name) { //Global Search
localReference.serverFacade.searchWithText(value, function(data) {
if(localSearchId === localReference.lastSearchId) {
@@ -551,7 +552,7 @@ function MainController(profile) {
callback(dataList);
};
- var dataGrid = new DataGridController(localReference, "Search Results", columns, getDataList);
+ var dataGrid = new DataGridController(localReference, searchDomainLabel + " Search Results", columns, getDataList);
localReference.currentView = dataGrid;
dataGrid.init($("#mainContainer"));
history.pushState(null, "", ""); //History Push State
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
index 3c14e8c493f..7f91e974b77 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/widgets/SideMenuWidget.js
@@ -416,6 +416,7 @@ function SideMenuWidget(mainController, containerId, serverFacade) {
$component.append(selectedSearchDomain.label);
}
$component.attr('selected-name', selectedSearchDomain.name);
+ $component.attr('selected-label', selectedSearchDomain.label);
};
}
--
GitLab