Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions app/plugins/LdapConnector/templates/LdapSchemas/fields.inc
Original file line number Diff line number Diff line change
@@ -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';
4 changes: 2 additions & 2 deletions app/src/Controller/StandardController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down