Browse Source

dont do drupal set message in access checks anymore just return false

pull/111/merge
Paul Pound 13 years ago
parent
commit
0e3f45e899
  1. 4
      islandora.module
  2. 1
      islandora_basic_collection/islandora_basic_collection.module
  3. 30
      islandora_basic_image/islandora-basic-image-view-objects.tpl.php
  4. 1
      islandora_basic_image/islandora_basic_image.module

4
islandora.module

@ -474,9 +474,7 @@ function islandora_view_object($object_id) {
foreach ($arr as $key => $value) {
$output .= $value; //if we have multiple modules handle one cmodel we need to iterate over multiple
}
//we could do another module invoke all here to build the edit tab with a default implemented in this module?
return $output; //just an example as we could have more then one array element
return $output;
}
/**

1
islandora_basic_collection/islandora_basic_collection.module

@ -84,7 +84,6 @@ function islandora_basic_collection_access($object_id) {
$restConnection = new RestConnection($user);
$fedora_object = new FedoraObject($object_id, $restConnection->repository);
} catch (Exception $e) {
drupal_set_message(t('Error getting Islandora object %s %e', array('%s' => $object_id, '%e' => $e)), 'error');
return FALSE;
}
if (!isset($fedora_object)) {

30
islandora_basic_image/islandora-basic-image-view-objects.tpl.php

@ -1,30 +0,0 @@
<?php
/*
* fedora-repository-object.tpl.php
*
*
*
* This file is part of Islandora.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with the program. If not, see <http ://www.gnu.org/licenses/>.
*/
?>
<?php
foreach($variables['results'] as $object){
print_r($object->label);
}?>

1
islandora_basic_image/islandora_basic_image.module

@ -117,7 +117,6 @@ function islandora_basic_image_access($object_id){
$restConnection = new RestConnection($user);
$fedora_object = new FedoraObject($object_id, $restConnection->repository);
} catch (Exception $e) {
drupal_set_message(t('Error getting Islandora object %s %e', array('%s' => $object_id, '%e' => $e)), 'error');
return FALSE;
}
if (!isset($fedora_object)) {

Loading…
Cancel
Save