From 4a592c1a457a5ceda0452e385ccb7a4efdd46960 Mon Sep 17 00:00:00 2001 From: Jonathan Green Date: Mon, 20 Mar 2017 17:20:22 -0300 Subject: [PATCH] ISLANDORA-1943 Update the datastream table so that it doesn't end up with missing collumns if you don't have certain permissions. --- theme/theme.inc | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/theme/theme.inc b/theme/theme.inc index a7441a93..60e6b343 100644 --- a/theme/theme.inc +++ b/theme/theme.inc @@ -53,13 +53,20 @@ function islandora_preprocess_islandora_default_edit(array &$variables) { 'class' => 'datastream-size', 'data' => islandora_datastream_get_human_readable_size($ds), ); + if (user_access(ISLANDORA_VIEW_DATASTREAM_HISTORY)) { + if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) { + $row[] = array( + 'class' => 'datastream-versions', + 'data' => theme('islandora_datastream_version_link', array( + 'datastream' => $ds, + )), + ); + } + else { + $row[] = array(); + } + } if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) { - $row[] = array( - 'class' => 'datastream-versions', - 'data' => theme('islandora_datastream_version_link', array( - 'datastream' => $ds, - )), - ); // Add new datastream content as the lastest version. $row[] = array( 'class' => 'datastream-replace', @@ -68,6 +75,9 @@ function islandora_preprocess_islandora_default_edit(array &$variables) { )), ); } + else { + $row[] = array(); + } $row[] = array( 'class' => 'datastream-download', 'data' => theme('islandora_datastream_download_link', array(