diff --git a/app/View/Elements/Events/View/row_attribute.ctp b/app/View/Elements/Events/View/row_attribute.ctp index a5f2cad5c..91e77aa88 100644 --- a/app/View/Elements/Events/View/row_attribute.ctp +++ b/app/View/Elements/Events/View/row_attribute.ctp @@ -91,13 +91,14 @@ $notes = !empty($object['Note']) ? $object['Note'] : []; $opinions = !empty($object['Opinion']) ? $object['Opinion'] : []; $relationships = !empty($object['Relationship']) ? $object['Relationship'] : []; + $relationshipsInbound = !empty($object['RelationshipInbound']) ? $object['RelationshipInbound'] : []; echo $this->element('genericElements/shortUuidWithNotes', [ 'uuid' => $object['uuid'], 'object_type' => 'Attribute', 'notes' => $notes, 'opinions' => $opinions, - 'relationships_outbound' => $relationships, - 'relationships_inbound' => $relationshipsInbound, + 'relationships' => $relationships, + 'relationshipsInbound' => $relationshipsInbound, ]); ?> diff --git a/app/View/Elements/Events/View/row_object.ctp b/app/View/Elements/Events/View/row_object.ctp index 46df43e1b..1022b609c 100644 --- a/app/View/Elements/Events/View/row_object.ctp +++ b/app/View/Elements/Events/View/row_object.ctp @@ -58,8 +58,8 @@ $objectId = intval($object['id']); 'object_type' => 'Attribute', 'notes' => $notes, 'opinions' => $opinions, - 'relationships_outbound' => $relationships, - 'relationships_inbound' => $relationshipsInbound, + 'relationships' => $relationships, + 'relationshipsInbound' => $relationshipsInbound, ]); ?> diff --git a/app/View/Elements/Events/View/row_proposal.ctp b/app/View/Elements/Events/View/row_proposal.ctp index f47db3cb7..1cddabddf 100644 --- a/app/View/Elements/Events/View/row_proposal.ctp +++ b/app/View/Elements/Events/View/row_proposal.ctp @@ -73,13 +73,14 @@ $notes = !empty($object['Note']) ? $object['Note'] : []; $opinions = !empty($object['Opinion']) ? $object['Opinion'] : []; $relationships = !empty($object['Relationship']) ? $object['Relationship'] : []; + $relationshipsInbound = !empty($object['RelationshipInbound']) ? $object['RelationshipInbound'] : []; echo $this->element('genericElements/shortUuidWithNotes', [ 'uuid' => $object['uuid'], 'object_type' => 'Attribute', 'notes' => $notes, 'opinions' => $opinions, - 'relationships_outbound' => $relationships, - 'relationships_inbound' => $relationshipsInbound, + 'relationships' => $relationships, + 'relationshipsInbound' => $relationshipsInbound, ]); ?> diff --git a/app/View/Elements/genericElements/IndexTable/Fields/shortUUIDWithNotes.ctp b/app/View/Elements/genericElements/IndexTable/Fields/shortUUIDWithNotes.ctp index 795ea0e62..822203f60 100644 --- a/app/View/Elements/genericElements/IndexTable/Fields/shortUUIDWithNotes.ctp +++ b/app/View/Elements/genericElements/IndexTable/Fields/shortUUIDWithNotes.ctp @@ -7,10 +7,12 @@ $notes = Hash::extract($row, $field['notes_data_path'] ?? 'Note'); $opinions = Hash::extract($row, $field['opinions_data_path'] ?? 'Opnion'); $relationships = Hash::extract($row, $field['relationships_data_path'] ?? 'Relationship'); + $relationshipsInbound = Hash::extract($row, $field['relationships_inbound_data_path'] ?? 'RelationshipInbound'); echo $this->element('genericElements/shortUuidWithNotes', [ 'uuid' => $uuid, 'object_type' => $field['object_type'], 'notes' => $notes, 'opinions' => $opinions, 'relationships' => $relationships, + 'relationshipsInbound' => $relationshipsInbound, ]); \ No newline at end of file diff --git a/app/View/EventReports/ajax/indexForEvent.ctp b/app/View/EventReports/ajax/indexForEvent.ctp index c6c4bf8fd..602b94f45 100644 --- a/app/View/EventReports/ajax/indexForEvent.ctp +++ b/app/View/EventReports/ajax/indexForEvent.ctp @@ -81,6 +81,7 @@ 'notes_data_path' => 'Note', 'opinions_data_path' => 'Opinion', 'relationships_data_path' => 'Relationship', + 'relationships_inbound_data_path' => 'RelationshipInbound', 'element' => 'shortUUIDWithNotes', 'object_type' => 'EventReport', ), diff --git a/app/View/EventReports/index.ctp b/app/View/EventReports/index.ctp index 783180df8..8510d44db 100644 --- a/app/View/EventReports/index.ctp +++ b/app/View/EventReports/index.ctp @@ -60,6 +60,7 @@ 'notes_data_path' => 'Note', 'opinions_data_path' => 'Opinion', 'relationships_data_path' => 'Relationship', + 'relationships_inbound_data_path' => 'RelationshipInbound', 'element' => 'shortUUIDWithNotes', 'object_type' => 'EventReport', ),