Merge pull request #4563 from magento-borg/MC-18721

[borg] Bug fixes

Author: nathanjosiah

app/code/Magento/Ui/view/base/web/js/grid/editing/record.js

@@ -134,11 +134,6 @@ define([
 
             field = utils.extend({}, fields.base, field);
 
-            field.__disableTmpl = {
-                label: true,
-                options: true
-            };
-
             return utils.template(field, {
                 record: this,
                 column: column

lib/web/mage/utils/template.js

@@ -40,7 +40,7 @@ define([
      * To limit recursion for a specific property add __disableTmpl: {propertyName: numberOfCycles}.
      *
      * @param {String} tmpl
-     * @param {Object} target
+     * @param {Object | undefined} target
      * @returns {Boolean|Object}
      */
     function isTmplIgnored(tmpl, target) {
@@ -136,7 +136,9 @@ define([
             cycles = 0;
 
         while (~tmpl.indexOf(opener) && (typeof maxCycles === 'undefined' || cycles < maxCycles)) {
-            tmpl = template(tmpl, data);
+            if (!isTmplIgnored(tmpl)) {
+                tmpl = template(tmpl, data);
+            }
 
             if (tmpl === last) {
                 break;