Browse Source

ISLANDORA-1943

Update the datastream table so that it doesn't end up with missing
collumns if you don't have certain permissions.
pull/670/head
Jonathan Green 8 years ago
parent
commit
4a592c1a45
No known key found for this signature in database
GPG Key ID: E96938FA4DF26243
  1. 10
      theme/theme.inc

10
theme/theme.inc

@ -53,6 +53,7 @@ function islandora_preprocess_islandora_default_edit(array &$variables) {
'class' => 'datastream-size', 'class' => 'datastream-size',
'data' => islandora_datastream_get_human_readable_size($ds), 'data' => islandora_datastream_get_human_readable_size($ds),
); );
if (user_access(ISLANDORA_VIEW_DATASTREAM_HISTORY)) {
if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) { if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) {
$row[] = array( $row[] = array(
'class' => 'datastream-versions', 'class' => 'datastream-versions',
@ -60,6 +61,12 @@ function islandora_preprocess_islandora_default_edit(array &$variables) {
'datastream' => $ds, 'datastream' => $ds,
)), )),
); );
}
else {
$row[] = array();
}
}
if (islandora_datastream_access(ISLANDORA_VIEW_DATASTREAM_HISTORY, $ds)) {
// Add new datastream content as the lastest version. // Add new datastream content as the lastest version.
$row[] = array( $row[] = array(
'class' => 'datastream-replace', 'class' => 'datastream-replace',
@ -68,6 +75,9 @@ function islandora_preprocess_islandora_default_edit(array &$variables) {
)), )),
); );
} }
else {
$row[] = array();
}
$row[] = array( $row[] = array(
'class' => 'datastream-download', 'class' => 'datastream-download',
'data' => theme('islandora_datastream_download_link', array( 'data' => theme('islandora_datastream_download_link', array(

Loading…
Cancel
Save