Minor code change

IDEMSInternational · Mar 10, 2022 · 976f90b · 976f90b
1 parent be74004
commit 976f90b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/instat/dlgName.vb b/instat/dlgName.vb
@@ -367,8 +367,7 @@ Public Class dlgName
             clsDefaultRFunction.RemoveParameterByPosition(5)
             RemoveLabelsParams()
         ElseIf rdoRenameWith.Checked Then
-            clsDefaultRFunction.RemoveParameterByName("case")
-            clsDefaultRFunction.RemoveParameterByName("minlength")
+            clsDefaultRFunction.RemoveParameterByPosition(7)
             If rdoToLower.Checked Then
                 clsDefaultRFunction.AddParameter(".fn", "tolower", iPosition:=5)
                 clsDummyRenameWithFunction.AddParameter("checked", "lower", iPosition:=0)

diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R
@@ -784,20 +784,20 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne
   } else if (type == "rename_with") {
     if (missing(.fn)) stop(.fn, "is missing with no default.")
     curr_col_names <- names(curr_data)
-    if(.fn == "abbreviate"){
+    if(deparse(substitute(.fn)) == "abbreviate"){
       private$data <- curr_data |>
-        dplyr::rename_with(
-           .fn = .fn,
-           .cols = {{ .cols }},
-           minlength = minlength, ...
-        )
+      dplyr::rename_with(
+         .fn = .fn,
+         .cols = {{ .cols }},
+         minlength = minlength, ...
+      )
     }
     else{
       private$data <- curr_data |>
-        dplyr::rename_with(
-           .fn = .fn,
-           .cols = {{ .cols }}, ...
-        )
+      dplyr::rename_with(
+         .fn = .fn,
+         .cols = {{ .cols }}, ...
+      )
     }
     new_col_names <- names(private$data)
     if (!all(new_col_names %in% curr_col_names)) {