Changeset 3684871

Timestamp:

09/07/2026 12:23:23 PM (7 weeks ago)

Author:

ztwoods

Message:

Release 1.5.1

Location:

wbs-connect-for-dataverse/trunk

Files:

• includes/collections.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• wbs-connect-for-dataverse.php (modified) (2 diffs)

wbs-connect-for-dataverse/trunk/includes/collections.php

@@ -192 +192 @@
         'entity_set'       => wbs_dataverse_connect_logical_name($config['entity_set'] ?? ''),
         'name_column'      => wbs_dataverse_connect_logical_name($config['name_column'] ?? ''),
+        'id_column'        => wbs_dataverse_connect_logical_name($config['id_column'] ?? ''),
         'slug_column'      => wbs_dataverse_connect_logical_name($config['slug_column'] ?? ''),
         'columns'          => wbs_dataverse_connect_logical_list($config['columns'] ?? []),
@@ -219 +220 @@
 }
 
-/** Logical name of the collection's primary key column. */
+/**
+ * Logical name of the collection's primary key column: the configured
+ * id_column, else the table's PrimaryIdAttribute from metadata, else the
+ * <table>id convention. Activity tables (task, email, appointment) use
+ * activityid, which is why the convention alone is not enough.
+ */
 function wbs_dataverse_connect_id_column($config) {
-    return $config['table'] . 'id';
+    if (!empty($config['id_column'])) {
+        return $config['id_column'];
+    }
+    static $memo = [];
+    $table = (string) $config['table'];
+    if (!array_key_exists($table, $memo)) {
+        $memo[$table] = '';
+        if (function_exists('wbs_dataverse_connect_metadata_entity')) {
+            $entity = wbs_dataverse_connect_metadata_entity($table, ['type' => 'metadata', 'config' => $config]);
+            if (is_array($entity) && !empty($entity['primary_id'])) {
+                $memo[$table] = wbs_dataverse_connect_logical_name($entity['primary_id']);
+            }
+        }
+    }
+    return $memo[$table] !== '' ? $memo[$table] : $table . 'id';
 }
 

wbs-connect-for-dataverse/trunk/readme.txt

@@ -5 +5 @@
 Tested up to: 7.1
 Requires PHP: 8.0
-Stable tag: 1.5.0
+Stable tag: 1.5.1
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
@@ -107 +107 @@
 == Changelog ==
 
+= 1.5.1 =
+* Primary key from metadata: collections over activity tables (task, email, appointment, phone call) and any other table whose key is not <table>id now work; an explicit id_column can also be set in code. Found while testing the Pro Business tier live.
+
 = 1.5.0 =
 * Search, filters and sort on collections: pick the columns on the Collections tab and visitors get a search box, filter dropdowns and sort choices that work without JavaScript. The [wbsdvc_collection] shortcode accepts per_page, search, filters and sort.

wbs-connect-for-dataverse/trunk/wbs-connect-for-dataverse.php

@@ -4 +4 @@
  * Plugin URI: https://woods.consulting/wbs-dataverse-connect-for-wordpress/
  * Description: Publish Microsoft Dataverse records as lists and detail views on your WordPress site, and write form submissions straight back into Dataverse tables.
- * Version: 1.5.0
+ * Version: 1.5.1
  * Author: WOODS Business Solutions
  * Author URI: https://woods.consulting
@@ -16 +16 @@
 if (!defined('ABSPATH')) { exit; }
 
-define('WBS_DATAVERSE_CONNECT_VERSION', '1.5.0');
+define('WBS_DATAVERSE_CONNECT_VERSION', '1.5.1');
 define('WBS_DATAVERSE_CONNECT_PATH', plugin_dir_path(__FILE__));
 define('WBS_DATAVERSE_CONNECT_URL',  plugin_dir_url(__FILE__));