Fix names/labels in SplitFormQuestions; DS-2601

Displayr · Aug 8, 2019 · 65243e0 · 65243e0
1 parent 524c6c8
commit 65243e0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/R/splitformquestions.R b/R/splitformquestions.R
@@ -22,7 +22,7 @@ SplitFormQuestions <- function(form.data, show.labels = TRUE,
         elem <- form.data[[i]]
         if (is.data.frame(elem))
         {
-            nms <- setdiff(Labels(elem), c("NET", "SUM"))
+            nms <- setdiff(names(elem), c("NET", "SUM"))
 
             # Grid questions also have column and row NETs/SUMs which need to
             # be removed
@@ -39,7 +39,7 @@ SplitFormQuestions <- function(form.data, show.labels = TRUE,
         }
         else if (show.labels)
         {
-            dat[[Labels(elem)]] <- elem
+            dat[[attr(elem, "label")]] <- elem
             is.grid <- c(is.grid, FALSE)
         }
         else