From d4bf607115be3e051dfbccc81b5775b8085caccd Mon Sep 17 00:00:00 2001
From: parkera <parkera>
Date: Wed, 9 Mar 2016 15:14:46 +0000
Subject: [PATCH] SSDM-3024 : Nearly feature complete view with model
SVN: 35859
---
.../html/js/views/AdvancedSearch/AdvancedSearchController.js | 4 ++++
.../html/js/views/AdvancedSearch/AdvancedSearchView.js | 3 +--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index 306a4ff6ac5..1730abe30be 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -24,4 +24,8 @@ function AdvancedSearchController(mainController) {
_this._advancedSearchView.repaint($container);
}
+ this.search = function() {
+ var model = this._advancedSearchModel.criteria;
+ Util.showInfo(JSON.stringify(model));
+ }
}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
index b6ed52f5f43..467b034b337 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchView.js
@@ -73,8 +73,7 @@ function AdvancedSearchView(advancedSearchController, advancedSearchModel) {
$menuPanelContainer.append(FormUtil.getFieldForComponentWithLabel($andOrDropdownComponent, "Using", null, true));
var $submitButton = FormUtil.getButtonWithIcon('glyphicon-search', function() {
- var model = _this._advancedSearchModel.criteria;
- Util.showInfo(JSON.stringify(model));
+ _this._advancedSearchController.search();
});
$menuPanelContainer.append($submitButton);
--
GitLab