Browse Source

made changes to manage permissions from codereview

ticket 853
pull/253/head
Phil Soga 12 years ago
parent
commit
17aa18157f
  1. 20
      .gitignore
  2. 8
      islandora.module

20
.gitignore vendored

@ -1,2 +1,22 @@
cache.properties cache.properties
.DS_Store .DS_Store
islandora.info~
includes/solution_packs.inc~
islandora.module~
tests/islandora_authtokens.test~
tests/islandora_basic_collection_manage_permissions.test~
tests/islandora_manage_perm.test~
tests/islandora_manage_permissions.test~
tests/islandora_web_test_case.inc~
theme/islandora-object.tpl.php~
theme/islandora.theme.inc~

8
islandora.module

@ -104,7 +104,7 @@ function islandora_menu() {
); );
$items['islandora/object/%islandora_object/manage'] = array( $items['islandora/object/%islandora_object/manage'] = array(
'title' => 'Manage', 'title' => 'Manage',
'page callback' => 'islandora_overview_object', 'page callback' => 'islandora_manage_overview_object',
'page arguments' => array(2), 'page arguments' => array(2),
'type' => MENU_LOCAL_TASK, 'type' => MENU_LOCAL_TASK,
'access callback' => 'islandora_object_manage_access_callback', 'access callback' => 'islandora_object_manage_access_callback',
@ -435,7 +435,7 @@ function islandora_object_manage_access_callback($perms, $object = NULL) {
* @return string * @return string
* The HTML repersentation of the manage object page. * The HTML repersentation of the manage object page.
*/ */
function islandora_overview_object(FedoraObject $object) { function islandora_manage_overview_object(FedoraObject $object) {
module_load_include('inc', 'islandora', 'includes/utilities'); module_load_include('inc', 'islandora', 'includes/utilities');
$output = array(); $output = array();
//return $output; //return $output;
@ -447,7 +447,7 @@ function islandora_overview_object(FedoraObject $object) {
} }
if (empty($output)) { if (empty($output)) {
// Add in the default, if we did not get any results. // Add in the default, if we did not get any results.
$output = islandora_default_islandora_overview_object($object); $output = islandora_default_islandora_manage_overview_object($object);
} }
arsort($output); arsort($output);
drupal_alter(ISLANDORA_OVERVIEW_HOOK, $object, $output); drupal_alter(ISLANDORA_OVERVIEW_HOOK, $object, $output);
@ -464,7 +464,7 @@ function islandora_overview_object(FedoraObject $object) {
* The default rendering of the object manage page, indexed at * The default rendering of the object manage page, indexed at
* 'Default Edit output'. * 'Default Edit output'.
*/ */
function islandora_default_islandora_overview_object(FedoraObject $object) { function islandora_default_islandora_manage_overview_object(FedoraObject $object) {
$output = theme('islandora_default_overview', array('islandora_object' => $object)); $output = theme('islandora_default_overview', array('islandora_object' => $object));
return array('Default overview output' => $output); return array('Default overview output' => $output);
} }

Loading…
Cancel
Save