From 12b4c4e610fd294258c5c023d0b7e4d6764bad6a Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Mon, 23 Mar 2015 13:53:57 -0300 Subject: [PATCH 1/4] Adding view to overview tab --- islandora.api.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/islandora.api.php b/islandora.api.php index dad43838..625dd7c5 100644 --- a/islandora.api.php +++ b/islandora.api.php @@ -601,7 +601,7 @@ function hook_cmodel_pid_islandora_overview_object(AbstractObject $object) { * Lets one alter the overview tab in object management. */ function hook_islandora_overview_object_alter(AbstractObject &$object, &$output) { - $output = $output . drupal_render(drupal_get_form('some_form', $object)); + $output = $output . drupal_render(drupal_get_form('some_form', $object))); } /** @@ -610,7 +610,12 @@ function hook_islandora_overview_object_alter(AbstractObject &$object, &$output) * Content model specific. */ function hook_cmodel_pid_islandora_overview_object_alter(AbstractObject &$object, &$output) { - $output = $output . drupal_render(drupal_get_form('some_form', $object)); + $view = views_embed_view('usage_collection'); + $form['islandora_manage_overview_object'] = array( + '#type' => 'item', + '#markup' => $view, + ); + $output = $output . $form . drupal_render(drupal_get_form('some_form', $object))); } /** From d63acbd7fb26c2bf1988534908883d08b4e7379f Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Mon, 23 Mar 2015 14:10:32 -0300 Subject: [PATCH 2/4] had to include this in commit, same as 7.x --- tests/includes/utilities.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/includes/utilities.inc b/tests/includes/utilities.inc index 4eef5255..eefae4cc 100644 --- a/tests/includes/utilities.inc +++ b/tests/includes/utilities.inc @@ -315,7 +315,7 @@ class IslandoraTestUtilities extends IslandoraTestUtilityClass { * * @return bool * TRUE if all objects were removed, or FALSE if any of them still remained - * after removal. + * after removal. */ public function deleteUserCreatedObjects($username) { if ($username === $this->configuration['admin_user']) { From 58c6174d284bc726a5e87c327f1ae5dd8bda9bda Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Mon, 23 Mar 2015 15:12:15 -0300 Subject: [PATCH 3/4] Cleaned up syntax --- islandora.api.php | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/islandora.api.php b/islandora.api.php index 742c77fd..95e08f1d 100644 --- a/islandora.api.php +++ b/islandora.api.php @@ -245,7 +245,7 @@ function hook_cmodel_pid_islandora_object_ingested(AbstractObject $object) { * modifications, where as manipulating an object's datstreams are not. * * @param AbstractObject $object - * The object that was modified. + * The object that was ingested. * * @todo We should also include what changes were made in a additional * parameter. @@ -254,7 +254,7 @@ function hook_islandora_object_modified(AbstractObject $object) { } /** - * Notify modules that the given object was modified. + * Notify modules that the given object was ingested. * * @see hook_islandora_object_modified() */ @@ -361,22 +361,9 @@ function hook_cmodel_pid_islandora_datastream_purged(AbstractObject $object, $ds * @param AbstractObject $object * The object to check. * @param string $dsid - * A string indicating the datastream for which to get the registry. - * - * @return array - * An array of associative arrays, each mapping: - * - name: A string containg a human-readable name for the entry. - * - url: A string containing the URL to which to the user will be routed. + * todo */ function hook_islandora_edit_datastream_registry($object, $dsid) { - $routes = array(); - - $routes[] = array( - 'name' => t('My Awesome Edit Route'), - 'url' => "go/edit/here/{$object->id}/{$dsid}", - ); - - return $routes; } /** @@ -614,7 +601,7 @@ function hook_cmodel_pid_islandora_overview_object(AbstractObject $object) { * Lets one alter the overview tab in object management. */ function hook_islandora_overview_object_alter(AbstractObject &$object, &$output) { - $output = $output . drupal_render(drupal_get_form('some_form', $object))); + $output = $output . drupal_render(drupal_get_form('some_form', $object)); } /** @@ -628,7 +615,7 @@ function hook_cmodel_pid_islandora_overview_object_alter(AbstractObject &$object '#type' => 'item', '#markup' => $view, ); - $output = $output . $form . drupal_render(drupal_get_form('some_form', $object))); + $output = $output . $form . drupal_render(drupal_get_form('some_form', $object)); } /** From 7ac58c5b6812dbfd507d088a5ea687c1fc24a09c Mon Sep 17 00:00:00 2001 From: Kylea Jackson Date: Wed, 1 Apr 2015 09:31:32 -0300 Subject: [PATCH 4/4] Changing and tags --- includes/add_datastream.form.inc | 2 +- includes/admin.form.inc | 8 +------- includes/utilities.inc | 8 ++++---- islandora.module | 4 ++-- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/includes/add_datastream.form.inc b/includes/add_datastream.form.inc index 55b45a04..3ad5a965 100644 --- a/includes/add_datastream.form.inc +++ b/includes/add_datastream.form.inc @@ -43,7 +43,7 @@ function islandora_add_datastream_form(array $form, array &$form_state, Abstract '#collapsed' => FALSE, 'dsid' => array( '#title' => 'Datastream ID', - '#description' => t("An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters, dashes and underscores. The following datastreams are defined by this content model but don't currently exist: @unused_dsids.", array('@unused_dsids' => $unused_datastreams)), + '#description' => t("An ID for this stream that is unique to this object. Must start with a letter and contain only alphanumeric characters, dashes and underscores. The following datastreams are defined by this content model but don't currently exist: @unused_dsids.", array('@unused_dsids' => $unused_datastreams)), '#type' => 'textfield', '#size' => 64, '#maxlength' => 64, diff --git a/includes/admin.form.inc b/includes/admin.form.inc index cf0b8f69..0d932697 100644 --- a/includes/admin.form.inc +++ b/includes/admin.form.inc @@ -74,12 +74,6 @@ function islandora_repository_admin(array $form, array &$form_state) { '#description' => t('Displays an extra print tab, allowing an object to be printed'), '#default_value' => variable_get('islandora_show_print_option', FALSE), ), - 'islandora_render_drupal_breadcrumbs' => array( - '#type' => 'checkbox', - '#title' => t('Render Drupal breadcrumbs'), - '#description' => t('Larger sites may experience a notable performance improvement when disabled due to how breadcrumbs are constructed.'), - '#default_value' => variable_get('islandora_render_drupal_breadcrumbs', TRUE), - ), ), 'islandora_namespace' => array( '#type' => 'fieldset', @@ -93,7 +87,7 @@ function islandora_repository_admin(array $form, array &$form_state) { 'islandora_pids_allowed' => array( '#type' => 'textarea', '#title' => t('PID namespaces allowed in this Drupal install'), - '#description' => t('A list of PID namespaces, separated by spaces, that users are permitted to access from this Drupal installation.
This could be more than a simple namespace, e.g. demo:mydemos.
The namespace islandora: is reserved, and is always allowed.'), + '#description' => t('A list of PID namespaces, separated by spaces, that users are permitted to access from this Drupal installation.
This could be more than a simple namespace, e.g. demo:mydemos.
The namespace islandora: is reserved, and is always allowed.'), '#default_value' => variable_get('islandora_pids_allowed', 'default: demo: changeme: ilives: islandora-book: books: newspapers: '), '#states' => array( 'invisible' => array( diff --git a/includes/utilities.inc b/includes/utilities.inc index 8682a4bc..8e071def 100644 --- a/includes/utilities.inc +++ b/includes/utilities.inc @@ -86,16 +86,16 @@ function islandora_temp_file_entry($file_uri, $mime = NULL) { function islandora_control_group_to_human_readable($control_group) { switch ($control_group) { case 'M': - return 'Managed'; + return 'Managed'; case 'X': - return 'Inline XML'; + return 'Inline XML'; case 'R': - return 'Redirect'; + return 'Redirect'; case 'E': - return 'Externally Referenced'; + return 'Externally Referenced'; default: return $control_group; diff --git a/islandora.module b/islandora.module index 567a39bd..a7d0cdee 100644 --- a/islandora.module +++ b/islandora.module @@ -1819,13 +1819,13 @@ function islandora_form_simpletest_test_form_alter(array &$form) { $filter_status = is_writable($filter_path); if ($filter_status) { $filter_status_message = theme_image(array('path' => 'misc/watchdog-ok.png', 'attributes' => array())) . " "; - $filter_status_message .= t("Drupal filter at !filter_path is writable by the server.", array( + $filter_status_message .= t("Drupal filter at !filter_path is writable by the server.", array( '!filter_path' => $filter_path, )); } else { $filter_status_message = theme_image(array('path' => 'misc/watchdog-error.png', 'attributes' => array())) . " "; - $filter_status_message .= t("Drupal filter at !filter_path is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, you will need to change it in your server's test config file, located in the Islandora module's 'tests' folder as test_config.ini or default.test_config.ini.", array( + $filter_status_message .= t("Drupal filter at !filter_path is not writable by the server. Please make sure your webserver has permission to write to the Drupal filter. If the path given is incorrect, you will need to change it in your server's test config file, located in the Islandora module's 'tests' folder as test_config.ini or default.test_config.ini.", array( '!filter_path' => $filter_path, )); }