v1.7.02

SKuipers · SKuipers · commit 0733a23a3381 · 2023-10-20T09:02:17.000+08:00
diff --git a/Data Admin/CHANGEDB.php b/Data Admin/CHANGEDB.php
@@ -161,3 +161,8 @@
 $count++;
 $sql[$count][0]="1.7.01" ;
 $sql[$count][1]="";
+
+//v1.7.02
+$count++;
+$sql[$count][0]="1.7.02" ;
+$sql[$count][1]="";
diff --git a/Data Admin/CHANGELOG.md b/Data Admin/CHANGELOG.md
@@ -1,5 +1,8 @@
 CHANGELOG
 =========
+## [1.7.02] 2023-10-20
+- Fixed export option in Manage Records when fields have multiple relational keys
+
 ## [1.7.01] 2023-06-18
 - Added Gibbon Person ID to the username finder
 
diff --git a/Data Admin/export_run.php b/Data Admin/export_run.php
@@ -143,8 +143,15 @@
             if ($importType->isFieldRelational($fieldName)) {
                 $join = $on = '';
                 extract($importType->getField($fieldName, 'relationship'));
-                $queryFieldsRelational = (is_array($field))? implode(',', $field) : $field;
 
+                // Handle fields that have multiple value options
+                if (!is_array($field) && stripos($field, '|') !== false) {
+                    $field = explode('|', $field);
+                    $field = current($field);
+                }
+
+                $queryFieldsRelational = (is_array($field))? implode(',', $field) : $field;
+                
                 // Build a query to grab data from relational tables
                 $relationalSQL = "SELECT `{$table}`.`{$key}` id, {$queryFieldsRelational} FROM `{$table}`";
 
@@ -261,6 +268,12 @@
                         extract($importType->getField($fieldName, 'relationship'));
                         $filter = $importType->getField($fieldName, 'filter');
 
+                        // Handle fields that have multiple value options
+                        if (!is_array($field) && stripos($field, '|') !== false) {
+                            $field = explode('|', $field);
+                            $field = current($field);
+                        }
+
                         $values = $filter == 'csv' ? array_map('trim', explode(',', $value)) : [$value];
                         $relationalValue = [];
 
diff --git a/Data Admin/manifest.php b/Data Admin/manifest.php
@@ -25,7 +25,7 @@
 $entryURL="import_manage.php" ; //The landing page for the unit, used in the main menu
 $type="Additional" ; //Do not change.
 $category="Admin" ; //The main menu area to place the module in
-$version="1.7.01" ; //Version number
+$version="1.7.02" ; //Version number
 $author="Sandra Kuipers" ; //Your name
 $url="https://github.com/SKuipers/" ; //Your URL
 
diff --git a/Data Admin/version.php b/Data Admin/version.php
@@ -20,7 +20,7 @@
 /**
  * Sets version information
  */
-$moduleVersion="1.7.01" ;
+$moduleVersion="1.7.02" ;
 $coreVersion = '23.0.00';
 
 $gibbonVersionRequired="23.0.00";
