From de225783a09079a2483543e9cf10c74afee03adb Mon Sep 17 00:00:00 2001
From: Jens Schuppe <schuppe@systopia.de>
Date: Thu, 6 Jan 2022 13:00:05 +0100
Subject: [PATCH] Correctly link resource entities in list of assignments

---
 CRM/Resource/BAO/ResourceDemand.php               |  3 ++-
 CRM/Resource/Form/DemandAssignments.php           | 12 ++++++------
 templates/CRM/Resource/Form/DemandAssignments.tpl |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CRM/Resource/BAO/ResourceDemand.php b/CRM/Resource/BAO/ResourceDemand.php
index 4297a90..1e86e4a 100644
--- a/CRM/Resource/BAO/ResourceDemand.php
+++ b/CRM/Resource/BAO/ResourceDemand.php
@@ -120,7 +120,8 @@ public function isFulfilledWithResource($resource, $cached = true, &$error_list
      *
      * @param $count integer maximal number of resources
      *
-     * @return array list of CRM_Resource_BAO_Resource
+     * @return CRM_Resource_BAO_Resource[]
+     *   A list of possible resources to fulfill the demand.
      */
     public function getResourceCandidates($count)
     {
diff --git a/CRM/Resource/Form/DemandAssignments.php b/CRM/Resource/Form/DemandAssignments.php
index 270271d..aea2b16 100644
--- a/CRM/Resource/Form/DemandAssignments.php
+++ b/CRM/Resource/Form/DemandAssignments.php
@@ -52,12 +52,12 @@ public function buildQuickForm()
         $display_resources = [];
         foreach ($this->assigned_resources as $resource) {
             /** @var CRM_Resource_BAO_Resource $resource */
-            $display_candidate = $resource->toArray();
-            $display_candidate['id'] = $resource->id;
-            $display_candidate['field_name'] = "unassign_{$resource->id}";
-            $display_candidate['meets_demand'] = $this->resource_demand->isFulfilledWithResource($resource);
-            $display_candidate['paths']['view'] = $candidate->getEntityUrl('view');
-            $display_resources[] = $display_candidate;
+            $display_resource = $resource->toArray();
+            $display_resource['id'] = $resource->id;
+            $display_resource['field_name'] = "unassign_{$resource->id}";
+            $display_resource['meets_demand'] = $this->resource_demand->isFulfilledWithResource($resource);
+            $display_resource['paths']['view'] = $resource->getEntityUrl('view');
+            $display_resources[] = $display_resource;
         }
 
         // assign some stuff
diff --git a/templates/CRM/Resource/Form/DemandAssignments.tpl b/templates/CRM/Resource/Form/DemandAssignments.tpl
index bcf1475..f364d5b 100644
--- a/templates/CRM/Resource/Form/DemandAssignments.tpl
+++ b/templates/CRM/Resource/Form/DemandAssignments.tpl
@@ -33,7 +33,7 @@
             <tr id="demand-{$resource.id}" class="demand resource-view {if $resource.meets_demand}resource-demand-met{else}resource-demand-not-met{/if}">
                 {assign var="field_name" value=$resource.field_name}
               <td>
-                <a href="{$candidate.paths.view}">
+                <a href="{$resource.paths.view}">
                     {$resource.label} [{$resource.id}]
                 </a>
               </td>