From 17aa18157f7ec4aa3d9286e9fd645fce02b0a990 Mon Sep 17 00:00:00 2001
From: Phil Soga <phil@discoverygarden.ca>
Date: Thu, 7 Feb 2013 09:38:47 -0400
Subject: [PATCH] made changes to manage permissions from codereview

ticket 853
---
 .gitignore       | 20 ++++++++++++++++++++
 islandora.module |  8 ++++----
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1133add7..c432e384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,22 @@
 cache.properties
 .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~
diff --git a/islandora.module b/islandora.module
index 2ddccc77..421994ae 100644
--- a/islandora.module
+++ b/islandora.module
@@ -104,7 +104,7 @@ function islandora_menu() {
   );
   $items['islandora/object/%islandora_object/manage'] = array(
     'title' => 'Manage',
-    'page callback' => 'islandora_overview_object',
+    'page callback' => 'islandora_manage_overview_object',
     'page arguments' => array(2),
     'type' => MENU_LOCAL_TASK,
     'access callback' => 'islandora_object_manage_access_callback',
@@ -435,7 +435,7 @@ function islandora_object_manage_access_callback($perms, $object = NULL) {
  * @return string
  *   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');
   $output = array();
   //return $output;  
@@ -447,7 +447,7 @@ function islandora_overview_object(FedoraObject $object) {
   }
   if (empty($output)) {
     // 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);
   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
  *   '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));
   return array('Default overview output' => $output);
 }