Handle initialisers from loadDefaults correctly #219

AtlasOfLivingAustralia · Jan 8, 2024 · 6f7e449 · 6f7e449
1 parent 9ffaed8
commit 6f7e449
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -1161,7 +1161,7 @@ function orEmptyArray(v) {
  self([]);
  }
  if (data === undefined) {
- self.loadDefaults();
+ initialisers = initialisers.concat(self.loadDefaults());
  }
  else {
  _.each(data, function (row, i) {

diff --git a/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy b/grails-app/taglib/au/org/ala/ecodata/forms/ModelJSTagLib.groovy
@@ -746,13 +746,13 @@ class ModelJSTagLib {
  boolean userAddedRows = Boolean.valueOf(viewModel?.userAddedRows)
  def defaultRows = []
  model.defaultRows?.eachWithIndex { row, i ->
- defaultRows << INDENT*5 + "rowInitialisers.push(${ctx.propertyPath}.${model.name}.addRow(${row.toString()}));"
+ defaultRows << INDENT*5 + "rowInitialisers = rowInitialisers.concat(${ctx.propertyPath}.${model.name}.addRow(${row.toString()}));"
  }
  def insertDefaultModel = defaultRows.join('\n')
 
  // If there are no default rows, insert a single blank row and make it available for editing.
  if (attrs.edit && model.defaultRows == null) {
- insertDefaultModel = "rowInitialisers.push(${ctx.propertyPath}.${model.name}.addRow());"
+ insertDefaultModel = "rowInitialisers = rowInitialisers.concat(${ctx.propertyPath}.${model.name}.addRow());"
  }
 
  out << """var context = _.extend({}, context, {parent:self, listName:'${model.name}'});"""