CFM-554_Fix_TermsAndConditions_entity_URL_accessor_overriding_database_column_for_Mostly_Static_Pages

app/src/Model/Entity/TAndCAgreement.php

@@ -46,22 +46,23 @@ class TAndCAgreement extends Entity {
   /**
    * Get the URL for this Terms and Conditions Agreement.
    *
-   * @since  COmanage Registry v5.3.0
    * @return string|null   URL
+   * @throws \Exception
+   * @since  COmanage Registry v5.3.0
    */
 
   protected function _getUrl(): ?string {
     // If the associated TermsAndConditions is already loaded, check it first
     if(!empty($this->terms_and_conditions)) {
-      return $this->terms_and_conditions->url;
+      return $this->terms_and_conditions->document_url;
     }
 
     // Otherwise look up the Terms and Conditions if terms_and_conditions_id is present
     if(!empty($this->terms_and_conditions_id)) {
       try {
         $TermsAndConditions = TableRegistry::getTableLocator()->get('TermsAndConditions');
 
-        return $TermsAndConditions->get($this->terms_and_conditions_id)->url;
+        return $TermsAndConditions->get($this->terms_and_conditions_id)->document_url;
       } catch(\Exception $e) {
         // We will rethrow here to facilitate debugging
         if (Configure::read('debug')) {

app/src/Model/Entity/TermsAndConditions.php

@@ -43,17 +43,21 @@ class TermsAndConditions extends Entity {
     'slug' => false, 
   ];
 
+  protected array $_virtual = [
+    'document_url'
+  ];
+
   /**
-   * Get the URL for this Terms and Conditions as a virtual field.
+   * Get the resolved document URL for this Terms and Conditions as a virtual field.
    *
    * @param string|null $url Existing URL field value
    * @return string|null      URL
    * @throws \Exception
    * @since  COmanage Registry v5.3.0
    */
-  protected function _getUrl(?string $url = null): ?string {
-    if(!empty($url)) {
-      return $url;
+  protected function _getDocumentUrl(?string $url = null): ?string {
+    if(!empty($this->url)) {
+      return $this->url;
     }
 
     if(!empty($this->mostly_static_page?->url)) {

app/templates/TermsAndConditions/columns.inc

@@ -49,6 +49,6 @@ $rowActions = [
   [
     'icon'  => 'arrow_outward',
     'label' => __d('operation', 'visit.tandc'),
-    'callbackUrl' => static fn($entity) => $entity->url
+    'callbackUrl' => static fn($entity) => $entity->document_url
   ]
 ];