From bffc4f725da5071852573e6efbd18f07c97e728d Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Tue, 10 Sep 2013 13:54:43 -0300 Subject: [PATCH 1/4] fixed permissions --- islandora.module | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/islandora.module b/islandora.module index 9fb41528..d213b777 100644 --- a/islandora.module +++ b/islandora.module @@ -22,7 +22,6 @@ * You should have received a copy of the GNU General Public License * along with the program. If not, see . */ - // Common datastreams. define('ISLANDORA_DS_COMP_STREAM', 'DS-COMPOSITE-MODEL'); @@ -485,6 +484,10 @@ function islandora_permission() { 'title' => t('Revert datastream history'), 'description' => t('Revert to a previous version of a datastream.'), ), + ISLANDORA_MANAGE_DELETED_OBJECTS => array( + 'title' => t('Manage deleted objects'), + 'description' => t('Purge or revert deleted objects.'), + ), ); } @@ -504,6 +507,7 @@ function islandora_print_object(AbstractObject $object) { drupal_set_title($object->label); return theme('islandora_object_print', array('object' => $object)); } + /** * Implements hook_forms(). */ @@ -871,7 +875,7 @@ function islandora_view_object(AbstractObject $object) { 'islandora' => array( 'print_img' => $path . '/images/print-icon.png'), ), array( - 'type' => 'setting')); + 'type' => 'setting')); drupal_add_js(array('islandora' => array('print_link' => 'islandora/object/' . $object->id . '/print')), array('type' => 'setting')); drupal_add_js($path . '/js/add_print.js'); From 5c7b425d0b507a907b3dd64534d4a073786188e0 Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Tue, 10 Sep 2013 13:56:12 -0300 Subject: [PATCH 2/4] Clarified text on delete button --- includes/object_properties.form.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/object_properties.form.inc b/includes/object_properties.form.inc index a3ceb9e9..838c4078 100644 --- a/includes/object_properties.form.inc +++ b/includes/object_properties.form.inc @@ -78,7 +78,7 @@ function islandora_object_properties_form(array $form, array &$form_state, Abstr 'delete' => array( '#type' => 'submit', '#access' => islandora_object_access(ISLANDORA_PURGE, $object), - '#value' => t('Delete'), + '#value' => t("Permanently remove '@label' from repository", array('@label' => $object->label)), '#submit' => array('islandora_object_properties_form_delete'), '#limit_validation_errors' => array(array('pid')), ), From 99fcc05e33cfdc34ef53dee56dce944d97c5ae14 Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Tue, 10 Sep 2013 13:59:17 -0300 Subject: [PATCH 3/4] coder --- islandora.module | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/islandora.module b/islandora.module index d213b777..45458665 100644 --- a/islandora.module +++ b/islandora.module @@ -22,6 +22,7 @@ * You should have received a copy of the GNU General Public License * along with the program. If not, see . */ + // Common datastreams. define('ISLANDORA_DS_COMP_STREAM', 'DS-COMPOSITE-MODEL'); @@ -875,7 +876,7 @@ function islandora_view_object(AbstractObject $object) { 'islandora' => array( 'print_img' => $path . '/images/print-icon.png'), ), array( - 'type' => 'setting')); + 'type' => 'setting')); drupal_add_js(array('islandora' => array('print_link' => 'islandora/object/' . $object->id . '/print')), array('type' => 'setting')); drupal_add_js($path . '/js/add_print.js'); From e3b3bd4c543a38b29ecca7f585bfb06b4840ca78 Mon Sep 17 00:00:00 2001 From: Alan Stanley Date: Tue, 10 Sep 2013 15:46:11 -0300 Subject: [PATCH 4/4] truncated long labels --- includes/object_properties.form.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/object_properties.form.inc b/includes/object_properties.form.inc index 838c4078..5295f067 100644 --- a/includes/object_properties.form.inc +++ b/includes/object_properties.form.inc @@ -78,7 +78,9 @@ function islandora_object_properties_form(array $form, array &$form_state, Abstr 'delete' => array( '#type' => 'submit', '#access' => islandora_object_access(ISLANDORA_PURGE, $object), - '#value' => t("Permanently remove '@label' from repository", array('@label' => $object->label)), + '#value' => t("Permanently remove '@label' from repository", array( + '@label' => truncate_utf8($object->label, 32, TRUE, TRUE)) + ), '#submit' => array('islandora_object_properties_form_delete'), '#limit_validation_errors' => array(array('pid')), ),