Merge commit '6ce55d2afac2a5d29e06144c1ec4730c8c8a4df1' into elastic2.0

eliranmoyal · eliranmoyal · commit 9a302bbdc9b1 · 2015-11-28T08:31:29.000+02:00
diff --git a/src/_site/mapping_parser.js b/src/_site/mapping_parser.js
@@ -29,7 +29,7 @@ function getFieldsRecursive(fields,fieldsFlatten,prefix){
 		if("type" in fieldMapping){
 			fieldsFlatten[prefix+field] = fieldMapping;
 		}
-		else {
+		if(!("type" in fieldMapping) || fieldMapping.type == "nested") {
 			getFieldsRecursive(fieldMapping["properties"],fieldsFlatten,prefix+field+".");
 		}
 	}
diff --git a/src/_site/query.js b/src/_site/query.js
@@ -357,17 +357,23 @@ var ShowQueryResultHandler = function(data) {
             }
         }
         else {
-            this.head = ["field","type","more"];
+            this.head = ["field","type"];
+            anyFieldContainsMore = false;
             fieldsWithMapping = mappingParser.getFieldsForTypeWithMapping(index,types[0]);
             for(field in fieldsWithMapping){
                 fieldRow = {};
                 fieldMapping = fieldsWithMapping[field];
                 fieldRow["field"] = field;
                 fieldRow["type"] = fieldMapping["type"];
                 delete fieldMapping["type"];
-                fieldRow["more"] = fieldMapping;
+                if(!$.isEmptyObject(fieldMapping)){
+                    anyFieldContainsMore = true;
+                    fieldRow["more"] = fieldMapping;
+                }
                 body.push(fieldRow);
             }
+            if(anyFieldContainsMore) this.head.push("more");
+
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ function getFieldsRecursive(fields,fieldsFlatten,prefix){`
`29`	`29`	`if("type" in fieldMapping){`
`30`	`30`	`fieldsFlatten[prefix+field] = fieldMapping;`
`31`	`31`	`}`
`32`		`- else {`
	`32`	`+ if(!("type" in fieldMapping) \|\| fieldMapping.type == "nested") {`
`33`	`33`	`getFieldsRecursive(fieldMapping["properties"],fieldsFlatten,prefix+field+".");`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -357,17 +357,23 @@ var ShowQueryResultHandler = function(data) {`
`357`	`357`	`}`
`358`	`358`	`}`
`359`	`359`	`else {`
`360`		`- this.head = ["field","type","more"];`
	`360`	`+ this.head = ["field","type"];`
	`361`	`+ anyFieldContainsMore = false;`
`361`	`362`	`fieldsWithMapping = mappingParser.getFieldsForTypeWithMapping(index,types[0]);`
`362`	`363`	`for(field in fieldsWithMapping){`
`363`	`364`	`fieldRow = {};`
`364`	`365`	`fieldMapping = fieldsWithMapping[field];`
`365`	`366`	`fieldRow["field"] = field;`
`366`	`367`	`fieldRow["type"] = fieldMapping["type"];`
`367`	`368`	`delete fieldMapping["type"];`
`368`		`- fieldRow["more"] = fieldMapping;`
	`369`	`+ if(!$.isEmptyObject(fieldMapping)){`
	`370`	`+ anyFieldContainsMore = true;`
	`371`	`+ fieldRow["more"] = fieldMapping;`
	`372`	`+ }`
`369`	`373`	`body.push(fieldRow);`
`370`	`374`	`}`
	`375`	`+ if(anyFieldContainsMore) this.head.push("more");`
	`376`	`+`
`371`	`377`	`}`
`372`	`378`	`}`
`373`	`379`