From 20ed04b84e5bdee2f2fff8839185b689673b210d Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Tue, 6 Oct 2026 15:57:57 +0300
Subject: [PATCH 1/2] Add LdapConnector.LdapSchemas missing fields.inc file

---
 .../templates/LdapSchemas/fields.inc          | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 app/plugins/LdapConnector/templates/LdapSchemas/fields.inc

diff --git a/app/plugins/LdapConnector/templates/LdapSchemas/fields.inc b/app/plugins/LdapConnector/templates/LdapSchemas/fields.inc
new file mode 100644
index 000000000..77b597289
--- /dev/null
+++ b/app/plugins/LdapConnector/templates/LdapSchemas/fields.inc
@@ -0,0 +1,19 @@
+<?php
+/**
+ * COmanage Registry LDAP Schemas Fields
+ *
+ * @link          https://www.internet2.edu/comanage COmanage Project
+ * @package       registry-plugins
+ * @since         COmanage Registry v5.3.0
+ * @license       Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+$fields = [
+  'description',
+  'status',
+  'plugin' => [
+    'disabled' => true,
+  ],
+];
+
+$subnav = 'standard';
\ No newline at end of file

From 6893fc1e7dea478edc7258a285cf07eb3f559708 Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Tue, 6 Oct 2026 17:47:19 +0300
Subject: [PATCH 2/2] Fix name lookup and flash message formatting on delete in
 StandardController

---
 app/src/Controller/StandardController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/Controller/StandardController.php b/app/src/Controller/StandardController.php
index f3bf01b34..143240c04 100644
--- a/app/src/Controller/StandardController.php
+++ b/app/src/Controller/StandardController.php
@@ -284,11 +284,11 @@ public function delete($id) {
           options: ['archived' => true],
         )->full_name;
         $message = __d('field', 'idpair', [$personName, $obj->id]);
-      } elseif (in_array('person_id', $primaryLinks)) {
+      } elseif (in_array('person_id', $primaryLinks) && !empty($obj->person_id)) {
         $Names = TableRegistry::getTableLocator()->get('Names');
         $personName = $Names->primaryName((int)$obj->person_id)->full_name;
         $displayValue = !empty($obj->$field) ? $obj->$field : $modelsName;
-        $message = __d('field', 'idpair', [$personName/$displayValue, $obj->id]);
+        $message = __d('field', 'idpair', ["$personName/$displayValue", $obj->id]);
       } elseif(!empty($obj->$field)) {
         $displayValue = !empty($obj->$field) ? $obj->$field : $modelsName;
         $message = $displayValue;