Bugfix: QC Merged - "Re-order searches" fix

From previous change, variable 'qcMergedPageMain' no longer on window object. Changed to pass qcMergedPageMain to searchesChangeDisplayOrder object.
yeastrc · Aug 27, 2019 · fb92231 · fb92231
1 parent 7644344
commit fb92231
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/...s/page_js/data_pages/project_search_ids_driven_pages/common/searchesChangeDisplayOrder.js b/...s/page_js/data_pages/project_search_ids_driven_pages/common/searchesChangeDisplayOrder.js
@@ -26,6 +26,11 @@ var SearchesChangeDisplayOrder = function( params ) {
 
 	// };
 
+	this.set_qcMergedPageMain = function( qcMergedPageMain ) {
+
+		this._qcMergedPageMain = qcMergedPageMain;
+	}
+
 	/**
 	 * 
 	 */
@@ -261,11 +266,11 @@ var SearchesChangeDisplayOrder = function( params ) {
 
 		//   Special case for Merged QC Page
 
-		if ( window.qcMergedPageMain ) {
+		if ( this._qcMergedPageMain ) {
 
-			//   qcMergedPageMain object on window object so call this instead of the code below
+			//   qcMergedPageMain object passed in so call this instead of the code below
 
-			qcMergedPageMain.changeProjectSearchIdOrderInURL( { projectSearchIdsInNewOrder : projectSearchIdsInNewOrder } );
+			this._qcMergedPageMain.changeProjectSearchIdOrderInURL( { projectSearchIdsInNewOrder : projectSearchIdsInNewOrder } );
 
 			return;  //  EARLY EXIT
 		}

diff --git a/...end/src/js/page_js/data_pages/project_search_ids_driven_pages/qc_page/qcMergedPageMain.js b/...end/src/js/page_js/data_pages/project_search_ids_driven_pages/qc_page/qcMergedPageMain.js
@@ -22,10 +22,10 @@ import { copyObject_DeepCopy_Proxl } from 'page_js/common_js_includes_all_pages/
 
 
 //  Import to make available on the page
-import { searchesChangeDisplayOrder } from 'page_js/data_pages/project_search_ids_driven_pages/common/searchesChangeDisplayOrder.js';
 import { searchesForPageChooser } from 'page_js/data_pages/project_search_ids_driven_pages/common/searchesForPageChooser.js';
 import { sharePageURLShortener  } from 'page_js/data_pages/project_search_ids_driven_pages/common/sharePageURLShortener.js';
 
+import { searchesChangeDisplayOrder } from 'page_js/data_pages/project_search_ids_driven_pages/common/searchesChangeDisplayOrder.js';
 
 import { DataPages_LoggedInUser_CommonObjectsFactory } from 'page_js/data_pages/data_pages_common/dataPages_LoggedInUser_CommonObjectsFactory.js';
 
@@ -1464,6 +1464,8 @@ var QCMergedPageMain = function() {
 
 const qcMergedPageMain = new QCMergedPageMain();
 
+searchesChangeDisplayOrder.set_qcMergedPageMain( qcMergedPageMain );
+
 qcMergedPageMain.init();
 
 //  Copy to standard page level JS Code Object