Browse Source

removed references to EDIT_TAGS_DATASTREAM, this permission is no longer used

pull/277/head
Alan Stanley 12 years ago
parent
commit
b5a7b6a607
  1. 1
      ObjectHelper.inc
  2. 1
      fedora_repository.module
  3. 1
      fedora_repository.test.inc
  4. 6
      plugins/tagging_form.inc
  5. 1
      tests/fedora_repository.test

1
ObjectHelper.inc

@ -17,7 +17,6 @@ class ObjectHelper {
public static $PURGE_FEDORA_OBJECTSANDSTREAMS = 'purge objects and datastreams'; public static $PURGE_FEDORA_OBJECTSANDSTREAMS = 'purge objects and datastreams';
public static $ADD_FEDORA_STREAMS = 'add fedora datastreams'; public static $ADD_FEDORA_STREAMS = 'add fedora datastreams';
public static $INGEST_FEDORA_OBJECTS = 'ingest new fedora objects'; public static $INGEST_FEDORA_OBJECTS = 'ingest new fedora objects';
public static $EDIT_TAGS_DATASTREAM = 'edit tags datastream';
public static $VIEW_DETAILED_CONTENT_LIST = 'view detailed list of content'; public static $VIEW_DETAILED_CONTENT_LIST = 'view detailed list of content';
public static $VIEW_FEDORA_SOAP_ERROR_MESSAGES = 'view fedora soap error messages'; public static $VIEW_FEDORA_SOAP_ERROR_MESSAGES = 'view fedora soap error messages';

1
fedora_repository.module

@ -933,7 +933,6 @@ function fedora_repository_perm() {
OBJECTHELPER::$PURGE_FEDORA_OBJECTSANDSTREAMS, OBJECTHELPER::$PURGE_FEDORA_OBJECTSANDSTREAMS,
OBJECTHELPER::$ADD_FEDORA_STREAMS, OBJECTHELPER::$ADD_FEDORA_STREAMS,
OBJECTHELPER::$INGEST_FEDORA_OBJECTS, OBJECTHELPER::$INGEST_FEDORA_OBJECTS,
OBJECTHELPER::$EDIT_TAGS_DATASTREAM,
OBJECTHELPER::$VIEW_DETAILED_CONTENT_LIST, OBJECTHELPER::$VIEW_DETAILED_CONTENT_LIST,
OBJECTHELPER::$VIEW_FEDORA_SOAP_ERROR_MESSAGES, OBJECTHELPER::$VIEW_FEDORA_SOAP_ERROR_MESSAGES,
); );

1
fedora_repository.test.inc

@ -43,7 +43,6 @@ abstract class IslandoraTestCase extends DrupalWebTestCase {
'access content', 'access content',
'add fedora datastreams', 'add fedora datastreams',
'edit fedora meta data', 'edit fedora meta data',
'edit tags datastream',
'ingest new fedora objects', 'ingest new fedora objects',
'purge objects and datastreams', 'purge objects and datastreams',
'view fedora collection', 'view fedora collection',

6
plugins/tagging_form.inc

@ -76,8 +76,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
'title' => $tag_title_text 'title' => $tag_title_text
))), ))),
); );
if (fedora_repository_check_perm('modify fedora datastreams', $pid) || if (fedora_repository_check_perm('modify fedora datastreams', $pid)) {
fedora_repository_check_perm('edit tags datastream', $pid)) {
// Delete button for each existing tag. // Delete button for each existing tag.
$form_tag['delete'] = array( $form_tag['delete'] = array(
'#type' => 'imagebutton', '#type' => 'imagebutton',
@ -87,8 +86,7 @@ function fedora_repository_image_tagging_form($form_state, $pid) {
); );
} }
} }
if (fedora_repository_check_perm('modify fedora datastreams', $pid) || if (fedora_repository_check_perm('modify fedora datastreams', $pid)) {
fedora_repository_check_perm('edit tags datastream', $pid)) {
$form['tags-wrapper']['addtag'] = array( $form['tags-wrapper']['addtag'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('New Tag'), '#title' => t('New Tag'),

1
tests/fedora_repository.test

@ -23,7 +23,6 @@ class FedoraRepositoryTestCase extends DrupalWebTestCase {
// Create and login user. // Create and login user.
$repository_user = $this->drupalCreateFedoraUser(array('add fedora datastreams', $repository_user = $this->drupalCreateFedoraUser(array('add fedora datastreams',
'edit fedora meta data', 'edit fedora meta data',
'edit tags datastream',
'ingest new fedora objects', 'ingest new fedora objects',
'purge objects and datastreams', 'purge objects and datastreams',
'view fedora collection', 'view fedora collection',

Loading…
Cancel
Save