Merge pull request #851 from africanmathsinitiative/master

merge from main
IDEMSInternational · Jan 31, 2018 · 9d693a4 · 9d693a4
2 parents 23a7ee9 + 18459ea
commit 9d693a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R
@@ -1537,7 +1537,7 @@ data_object$set("public", "filter_string", function(filter_name) {
   out = "("
   i = 1
   for(condition in curr_filter$filter_conditions) {
-    if(i != 1) out = paste(out, "&&")
+    if(i != 1) out = paste(out, "&")
     out = paste0(out, " (", condition[["column"]], " ", condition[["operation"]])
     if(condition[["operation"]] == "%in%") out = paste0(out, " c(", paste(paste0("'", condition[["value"]], "'"), collapse = ","), ")")
     else out = paste(out, condition[["value"]])