From 298b1536ee86e3db2eaeaf7e6235def0b89e1c75 Mon Sep 17 00:00:00 2001 From: temi Date: Mon, 8 Apr 2024 16:40:44 +1000 Subject: [PATCH] AtlasOfLivingAustralia/fieldcapture#3049 - renamed property holding a list's parent object to avoid potential issues --- grails-app/assets/javascripts/forms-knockout-bindings.js | 4 ++-- grails-app/assets/javascripts/forms.js | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/grails-app/assets/javascripts/forms-knockout-bindings.js b/grails-app/assets/javascripts/forms-knockout-bindings.js index 4a59ed5..027d107 100644 --- a/grails-app/assets/javascripts/forms-knockout-bindings.js +++ b/grails-app/assets/javascripts/forms-knockout-bindings.js @@ -1243,8 +1243,8 @@ propTarget.loadData(value); } else if (_.isFunction(propTarget.load)) { propTarget.load(value); - } else if (propTarget && propTarget.$parent && _.isFunction(propTarget.$parent["load" + propTarget.listName])) { - propTarget.$parent["load" + propTarget.listName](value); + } else if (propTarget && propTarget.listParent && _.isFunction(propTarget.listParent["load" + propTarget.listName])) { + propTarget.listParent["load" + propTarget.listName](value); } else if (ko.isObservable(propTarget)) { propTarget(value); } else { diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js index 0812af8..de9a20c 100644 --- a/grails-app/assets/javascripts/forms.js +++ b/grails-app/assets/javascripts/forms.js @@ -1083,7 +1083,8 @@ function orEmptyArray(v) { var parent = context.parent; var listName = context.listName; var modelName = context.outputModel.name; - self.$parent = context.parent; + + self.listParent = context.parent; self.listName = listName; self.addRow = function (data) { var newItem = self.newItem(data, self.rowCount());