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 @@ + [ + 'disabled' => true, + ], +]; + +$subnav = 'standard'; \ No newline at end of file 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;