Merge remote-tracking branch 'couchbase/vulcan' into alice

* MB-32142: Pass empty string instead of undefined to js_beautify func Change-Id: I0efdaa9cb2f9fb2bc644a0413a65ab11fdb4b2e7
couchbase · Dec 2, 2018 · fb8e6ad · fb8e6ad
2 parents aeeeb40 + 83c5d3a
commit fb8e6ad
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/priv/public/ui/app/mn_admin/mn_indexes/mn_views/editing/mn_views_editing_service.js b/priv/public/ui/app/mn_admin/mn_indexes/mn_views/editing/mn_views_editing_service.js
@@ -102,7 +102,7 @@
 
     function prepareDocForCodeMirror(doc) {
       doc.metaJSON = angular.toJson(doc.meta, 2);
-      doc.jsonJSON = js_beautify(doc.json, {"indent_size": 2});
+      doc.jsonJSON = js_beautify(doc.json || "", {"indent_size": 2});
       return doc;
     }