Fixed Issue #93: Problem in the included and excluded indices

jettro · Nov 26, 2015 · 7d9e3b8 · 7d9e3b8
1 parent bf84efa
commit 7d9e3b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/_site/assets/js/elasticsearch-gui.js b/_site/assets/js/elasticsearch-gui.js
@@ -657,17 +657,17 @@
 
         function indexIsNotIgnored(index) {
             var ignore = false;
-            if (configuration.includedIndexes && configuration.includedIndexes.length > 0) {
+            if (configuration.configuration.includedIndexes && configuration.configuration.includedIndexes.length > 0) {
                 ignore = true;
-                var includedIndexes = (configuration.includedIndexes) ? configuration.includedIndexes.split(",") : [];
+                var includedIndexes = (configuration.configuration.includedIndexes) ? configuration.configuration.includedIndexes.split(",") : [];
                 angular.forEach(includedIndexes, function (includedIndex) {
                     var indexToCheck = includedIndex.trim();
                     if (index.substring(0, indexToCheck.length) === indexToCheck) {
                         ignore = false;
                     }
                 });
             } else {
-                var excludedIndexes = (configuration.excludedIndexes) ? configuration.excludedIndexes.split(",") : [];
+                var excludedIndexes = (configuration.configuration.excludedIndexes) ? configuration.configuration.excludedIndexes.split(",") : [];
                 angular.forEach(excludedIndexes, function (excludedIndex) {
                     var indexToCheck = excludedIndex.trim();
                     if (index.substring(0, indexToCheck.length) === indexToCheck) {

diff --git a/_site/assets/js/elasticsearch-gui.min.js b/_site/assets/js/elasticsearch-gui.min.js
diff --git a/_site/assets/js/elasticsearch-gui.min.js.map b/_site/assets/js/elasticsearch-gui.min.js.map
diff --git a/javascript/services/elastic.service.js b/javascript/services/elastic.service.js
@@ -396,17 +396,17 @@
 
         function indexIsNotIgnored(index) {
             var ignore = false;
-            if (configuration.includedIndexes && configuration.includedIndexes.length > 0) {
+            if (configuration.configuration.includedIndexes && configuration.configuration.includedIndexes.length > 0) {
                 ignore = true;
-                var includedIndexes = (configuration.includedIndexes) ? configuration.includedIndexes.split(",") : [];
+                var includedIndexes = (configuration.configuration.includedIndexes) ? configuration.configuration.includedIndexes.split(",") : [];
                 angular.forEach(includedIndexes, function (includedIndex) {
                     var indexToCheck = includedIndex.trim();
                     if (index.substring(0, indexToCheck.length) === indexToCheck) {
                         ignore = false;
                     }
                 });
             } else {
-                var excludedIndexes = (configuration.excludedIndexes) ? configuration.excludedIndexes.split(",") : [];
+                var excludedIndexes = (configuration.configuration.excludedIndexes) ? configuration.configuration.excludedIndexes.split(",") : [];
                 angular.forEach(excludedIndexes, function (excludedIndex) {
                     var indexToCheck = excludedIndex.trim();
                     if (index.substring(0, indexToCheck.length) === indexToCheck) {