Browse Source

Patching up vagrant build.

7.x-2.x
Daniel Lamb 9 years ago
parent
commit
33733f19c9
  1. 10
      islandora_basic_image/islandora_basic_image.module
  2. 12
      islandora_collection/islandora_collection.module

10
islandora_basic_image/islandora_basic_image.module

@ -50,15 +50,15 @@ function islandora_basic_image_form_islandora_basic_image_node_form_alter(&$form
->condition('n.type', ISLANDORA_COLLECTION_CONTENT_TYPE) ->condition('n.type', ISLANDORA_COLLECTION_CONTENT_TYPE)
->execute() ->execute()
->fetchAllKeyed(); ->fetchAllKeyed();
$options = $default + $from_db; $options = $default + $from_db;
// Add the select to the form. // Add the select to the form.
$form['parent_collection'] = array( $form['parent_collection'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Parent Collection'), '#title' => t('Parent Collection'),
'#description' => t('Select the parent collection to add this to. Select "Fedora Root" if you want it to be a top-level collection'), '#description' => t('Select the parent collection to add this to. Select "Fedora Root" if you want it to be a top-level collection'),
'#options' => $options, '#options' => $options,
'#default_value' => '', '#default_value' => '',
'#weight' => -4, '#weight' => -4,
); );
@ -131,7 +131,7 @@ function islandora_basic_image_node_postinsert($node) {
); );
} }
httprl_request("http://10.0.2.15:8888/islandora/rest/basic-image/?uuid=$parent_collection", httprl_request("http://127.0.0.1:8888/islandora/rest/basic-image/?uuid=$parent_collection",
$options); $options);
$response = httprl_send_request(); $response = httprl_send_request();
} }
@ -171,7 +171,7 @@ function islandora_basic_image_node_postupdate($node) {
); );
} }
httprl_request("http://10.0.2.15:8888/islandora/rest/basic-image/?uuid={$node->uuid}", httprl_request("http://127.0.0.1:8888/islandora/rest/basic-image/?uuid={$node->uuid}",
$options); $options);
$response = httprl_send_request(); $response = httprl_send_request();
} }

12
islandora_collection/islandora_collection.module

@ -53,15 +53,15 @@ function islandora_collection_form_islandora_collection_node_form_alter(&$form,
->condition('n.type', ISLANDORA_COLLECTION_CONTENT_TYPE) ->condition('n.type', ISLANDORA_COLLECTION_CONTENT_TYPE)
->execute() ->execute()
->fetchAllKeyed(); ->fetchAllKeyed();
$options = $default + $from_db; $options = $default + $from_db;
// Add the select to the form. // Add the select to the form.
$form['parent_collection'] = array( $form['parent_collection'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Parent Collection'), '#title' => t('Parent Collection'),
'#description' => t('Select the parent collection to add this to. Select "Fedora Root" if you want it to be a top-level collection'), '#description' => t('Select the parent collection to add this to. Select "Fedora Root" if you want it to be a top-level collection'),
'#options' => $options, '#options' => $options,
'#default_value' => '', '#default_value' => '',
'#weight' => -4, '#weight' => -4,
); );
@ -117,7 +117,7 @@ function islandora_collection_node_postinsert($node) {
} }
$node = array_pop($nodes); $node = array_pop($nodes);
$url = "http://localhost:8181/islandora/rest/collection/$parent_collection"; $url = "http://127.0.0.1:8181/islandora/rest/collection/$parent_collection";
dd("REQUEST URL: $url"); dd("REQUEST URL: $url");
// Don't forget the trailing slash. // Don't forget the trailing slash.
@ -155,7 +155,7 @@ function islandora_collection_node_postupdate($node) {
$node = array_pop($nodes); $node = array_pop($nodes);
$uuid = $node->uuid; $uuid = $node->uuid;
httprl_request("http://localhost:8181/islandora/rest/collection/$uuid", httprl_request("http://127.0.0.1:8181/islandora/rest/collection/$uuid",
array( array(
'method' => 'PUT', 'method' => 'PUT',
'data' => json_encode($node), 'data' => json_encode($node),
@ -177,7 +177,7 @@ function islandora_collection_node_postdelete($node) {
} }
$uuid = $node->uuid; $uuid = $node->uuid;
httprl_request("http://localhost:8181/islandora/rest/collection/$uuid", httprl_request("http://127.0.0.1:8181/islandora/rest/collection/$uuid",
array( array(
'method' => 'DELETE', 'method' => 'DELETE',
)); ));

Loading…
Cancel
Save