Fix error message in addForm.formSchema; Fix to default of deprecated…

… parentIdColumn in importRecords(); Tests for the number of columns of deeply nested subforms and references and cycles with reference fields; documentation update
bedatadriven · Oct 15, 2024 · 952ad7c · 952ad7c
1 parent a492f69
commit 952ad7c
Show file tree

Hide file tree

Showing 11 changed files with 1,246 additions and 19 deletions.
diff --git a/R/forms.R b/R/forms.R
@@ -230,7 +230,7 @@ addForm.formSchema <- function(schema, parentId=NULL, folderId=NULL, ...) {
   })
 
   if (!is.null(result$code)&&result$code == "BAD_REQUEST") {
-    stop("The server returned 'BAD_REQUEST' when trying to add the form '%s' with id %s in database %s. Check the form schema and fields.")
+    stop(sprintf("The server returned 'BAD_REQUEST' when trying to add the form '%s' with id %s in database %s. Check the form schema and fields.",schema$label, schema$id, schema$databaseId))
   }
 
   # The API returns all affected forms, as well as the database tree.

diff --git a/R/import.R b/R/import.R
@@ -16,7 +16,7 @@
 #'
 #' @importFrom utils head
 #' @export
-importRecords <- function(formId, data, recordIdColumn, parentRecordIdColumn, stageDirect = TRUE, progress = getOption("activityinfo.import.progress", default = TRUE), parentIdColumn = parentRecordId) { 
+importRecords <- function(formId, data, recordIdColumn, parentRecordIdColumn, stageDirect = TRUE, progress = getOption("activityinfo.import.progress", default = TRUE), parentIdColumn = parentRecordIdColumn) { 
   parentId <- NULL
 
   schema <- activityinfo::getFormSchema(formId)

diff --git a/man/allColumnStyle.Rd b/man/allColumnStyle.Rd
diff --git a/man/columnStyle.Rd b/man/columnStyle.Rd
diff --git a/man/createFormSchemaFromData.Rd b/man/createFormSchemaFromData.Rd
diff --git a/man/idColumnStyle.Rd b/man/idColumnStyle.Rd
diff --git a/man/importRecords.Rd b/man/importRecords.Rd
diff --git a/man/minimalColumnStyle.Rd b/man/minimalColumnStyle.Rd
diff --git a/man/prettyColumnStyle.Rd b/man/prettyColumnStyle.Rd