Merge pull request #327 from nitishgoyal13/master

Bug fix n UI
billmcchesney1 · Jul 22, 2020 · 1301cac · 1301cac
2 parents ac6d366 + 49177c6
commit 1301cac
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/foxtrot-server/src/main/resources/console/echo/js/functions.js b/foxtrot-server/src/main/resources/console/echo/js/functions.js
@@ -384,14 +384,19 @@ function resetGloblaDateFilter() {
 
 function loadParticularConsole() { // reload page based on selected console
   var selectedConsole = $("#listConsole").val();
-  if(window.location.href.indexOf("fql") > -1 || window.location.href.indexOf("browse") > -1) {
-    window.location.href = "/echo/index.htm?console=" + selectedConsole    
- } else {
-   //window.location.assign("index.htm?console=" + selectedConsole);
-   loadConsolesWithoutRefreshing(selectedConsole)
- }
+if(window.location.href.indexOf("fql") > -1) {
+  window.location.href = "/index.htm?console=" + selectedConsole ;
+  } else if(window.location.href.indexOf("browse") > -1) {
+    window.location.href = "/index.htm?console=" + selectedConsole ;
+  } 
+  else if(window.location.href.indexOf("index") > -1) {
+    loadConsolesWithoutRefreshing(selectedConsole)
+  } 
+  else {
+  //window.location.assign("index.htm?console=" + selectedConsole);
+  window.location.href = "/index.htm?console=" + selectedConsole ;
+  }
 }
-
 function getWhereOption(fieldType) {
   var allOption = '<option value="">Select</option><option value="equals">Equal to</option><option value="not_equals">Not Equal to</option><option value="less_than">Less than</option><option value="less_equal">Less or equal to</option><option value="greater_than">Greater than</option><option value="greater_equal">Greater or equal to</option><option value="contains">Equals</option><option value="in">In</option><option value="not_equals">Not equals</option><option value="contains">Contains</option><option value="between">Between</option><option value="exists">Exist</option><option value="not_in">Not In</option>';