Use URL web root for Access Copies links. (#1744)

artefactual · Jan 30, 2024 · 1da4fc3 · 1da4fc3
1 parent 3094418
commit 1da4fc3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/apps/qubit/modules/digitalobject/templates/_metadata.php b/apps/qubit/modules/digitalobject/templates/_metadata.php
@@ -133,7 +133,7 @@
 
           <?php if ($showMasterFileName) { ?>
             <?php if ($canAccessMasterFile) { ?>
-              <?php echo render_show(__('Filename'), link_to($resource->name, $resource->object->getDigitalObjectUrl(), ['target' => '_blank']), ['fieldLabel' => 'filename']); ?>
+              <?php echo render_show(__('Filename'), link_to($resource->name, public_path($resource->object->getDigitalObjectUrl()), ['target' => '_blank']), ['fieldLabel' => 'filename']); ?>
             <?php } else { ?>
               <?php echo render_show(__('Filename'), $resource->name, ['fieldLabel' => 'filename']); ?>
             <?php } ?>
@@ -172,7 +172,7 @@
         <div class="digital-object-metadata-body">
           <?php if ($showReferenceCopyFileName) { ?>
             <?php if ($canAccessReferenceCopy && $sf_user->isAuthenticated()) { ?>
-              <?php echo render_show(__('Filename'), link_to($referenceCopy->name, $referenceCopy->getFullPath(), ['target' => '_blank']), ['fieldLabel' => 'referenceCopyFileName']); ?>
+              <?php echo render_show(__('Filename'), link_to($referenceCopy->name, public_path($referenceCopy->getFullPath()), ['target' => '_blank']), ['fieldLabel' => 'referenceCopyFileName']); ?>
             <?php } else { ?>
               <?php echo render_show(__('Filename'), $referenceCopy->name, ['fieldLabel' => 'referenceCopyFileName']); ?>
             <?php } ?>
@@ -211,7 +211,7 @@
         <div class="digital-object-metadata-body">
           <?php if ($showThumbnailCopyFileName) { ?>
             <?php if ($canAccessThumbnailCopy) { ?>
-              <?php echo render_show(__('Filename'), link_to($thumbnailCopy->name, $thumbnailCopy->getFullPath(), ['target' => '_blank']), ['fieldLabel' => 'thumbnailCopyFileName']); ?>
+              <?php echo render_show(__('Filename'), link_to($thumbnailCopy->name, public_path($thumbnailCopy->getFullPath()), ['target' => '_blank']), ['fieldLabel' => 'thumbnailCopyFileName']); ?>
             <?php } else { ?>
               <?php echo render_show(__('Filename'), $thumbnailCopy->name, ['fieldLabel' => 'thumbnailCopyFileName']); ?>
             <?php } ?>

diff --git a/plugins/arDominionB5Plugin/modules/digitalobject/templates/_metadata.php b/plugins/arDominionB5Plugin/modules/digitalobject/templates/_metadata.php
@@ -161,7 +161,7 @@
 
                     <?php if ($showMasterFileName) { ?>
                       <?php if ($canAccessMasterFile) { ?>
-                        <?php echo render_show(__('Filename'), link_to($resource->name, $resource->object->getDigitalObjectUrl(), ['target' => '_blank']), ['fieldLabel' => 'filename', 'isSubField' => true]); ?>
+                        <?php echo render_show(__('Filename'), link_to($resource->name, public_path($resource->object->getDigitalObjectUrl()), ['target' => '_blank']), ['fieldLabel' => 'filename', 'isSubField' => true]); ?>
                       <?php } else { ?>
                         <?php echo render_show(__('Filename'), $resource->name, ['fieldLabel' => 'filename', 'isSubField' => true]); ?>
                       <?php } ?>
@@ -201,7 +201,7 @@
                   <div class="digital-object-metadata-body <?php echo render_b5_show_value_css_classes(); ?>">
                     <?php if ($showReferenceCopyFileName) { ?>
                       <?php if ($canAccessReferenceCopy && $sf_user->isAuthenticated()) { ?>
-                        <?php echo render_show(__('Filename'), link_to($referenceCopy->name, $referenceCopy->getFullPath(), ['target' => '_blank']), ['fieldLabel' => 'referenceCopyFileName', 'isSubField' => true]); ?>
+                        <?php echo render_show(__('Filename'), link_to($referenceCopy->name, public_path($referenceCopy->getFullPath()), ['target' => '_blank']), ['fieldLabel' => 'referenceCopyFileName', 'isSubField' => true]); ?>
                       <?php } else { ?>
                         <?php echo render_show(__('Filename'), $referenceCopy->name, ['fieldLabel' => 'referenceCopyFileName', 'isSubField' => true]); ?>
                       <?php } ?>
@@ -241,7 +241,7 @@
                   <div class="digital-object-metadata-body <?php echo render_b5_show_value_css_classes(); ?>">
                     <?php if ($showThumbnailCopyFileName) { ?>
                       <?php if ($canAccessThumbnailCopy) { ?>
-                        <?php echo render_show(__('Filename'), link_to($thumbnailCopy->name, $thumbnailCopy->getFullPath(), ['target' => '_blank']), ['fieldLabel' => 'thumbnailCopyFileName', 'isSubField' => true]); ?>
+                        <?php echo render_show(__('Filename'), link_to($thumbnailCopy->name, public_path($thumbnailCopy->getFullPath()), ['target' => '_blank']), ['fieldLabel' => 'thumbnailCopyFileName', 'isSubField' => true]); ?>
                       <?php } else { ?>
                         <?php echo render_show(__('Filename'), $thumbnailCopy->name, ['fieldLabel' => 'thumbnailCopyFileName', 'isSubField' => true]); ?>
                       <?php } ?>