') !== FALSE) {
+ $references[$entity_machine_name][$bundle_machine_name][$field_machine_name] = $field_info;
+ continue;
+ }
+
+ // Get field base and instance information.
$field_info_field = field_info_field($field_machine_name);
$field_instance_info = field_info_instance($entity_machine_name, $field_machine_name, $bundle_machine_name);
@@ -475,43 +412,8 @@ function stanford_capx_mapper_form_get_field_mapping_form($form, &$form_state, $
'#theme_wrappers' => array('stanford_capx_columns_to_the_right'),
);
- // Do not give all options for the file field. File field processor
- // will take care of most.
- if ($field_info_field['type'] == "file" || $field_info_field['type'] == "image") {
- $form['field-mapping'][$field_container][$field_machine_name][0] = array(
- '#type' => 'textfield',
- '#title' => t('File Information'),
- '#description' => t('In your JSON Path selector please pass in the whole array of image information. eg: $.profilePhotos.bigger'),
- '#default_value' => @$mapper->fields[$field_machine_name][0],
- );
-
- if ($field_instance_info['required']) {
- $form['field-mapping'][$field_container][$field_machine_name]['#attributes']['class'][] = "required";
- }
-
- continue;
- }
-
- // Relation module doesn't have this column key set.
- if (!isset($field_info_field['columns'])) {
- continue;
- }
-
- foreach ($field_info_field['columns'] as $column_key => $column_info) {
- if (!in_array($column_key, $CAP_RESTRICTED_FIELD_PROPERTIES)) {
-
- $form['field-mapping'][$field_container][$field_machine_name][$column_key] = array(
- '#type' => 'textfield',
- '#title' => t("@var", array("@var" => $column_key)),
- '#description' => !empty($column_info['description']) ? t("@var", array("@var" => $column_info['description'])) : "",
- '#default_value' => isset($mapper->fields[$field_machine_name][$column_key]) ? $mapper->fields[$field_machine_name][$column_key] : "",
- );
-
- if ($field_instance_info['required']) {
- $form['field-mapping'][$field_container][$field_machine_name]['#attributes']['class'][] = "required";
- }
- }
- }
+ // Get this forms fields for the entity/bundle fields.
+ stanford_capx_mapper_form_get_fields_fields($form['field-mapping'][$field_container][$field_machine_name], $form_state, $field_info_field, $field_instance_info, $field_machine_name, $mapper);
}
@@ -524,11 +426,10 @@ function stanford_capx_mapper_form_get_field_mapping_form($form, &$form_state, $
foreach ($field_collections as $entity_machine_name => $bundles) {
foreach ($bundles as $bundle_machine_name => $fields) {
foreach ($fields as $field_machine_name => $field_info) {
-
$instances = field_info_instances('field_collection_item', $field_machine_name);
$collection_container = $entity_machine_name . "-" . $bundle_machine_name . "-collections";
- // Fieldset for all fields on this entity -> bundle -> collection field
+ // Fieldset for all fields on this entity -> bundle -> collection field.
$form['field-mapping'][$collection_container][$field_machine_name] = array(
'#type' => 'fieldset',
'#title' => t('@name Field Collection', array("@name" => $field_machine_name)),
@@ -546,7 +447,6 @@ function stanford_capx_mapper_form_get_field_mapping_form($form, &$form_state, $
foreach ($instances as $fc_field_name => $instance_info) {
$fc_field_info = field_info_field($fc_field_name);
-
$form['field-mapping'][$collection_container][$field_machine_name][$fc_field_name] = array(
'#type' => 'container',
'#title' => t("@var", array("@var" => $instance_info['label'])),
@@ -556,34 +456,57 @@ function stanford_capx_mapper_form_get_field_mapping_form($form, &$form_state, $
'#theme_wrappers' => array('stanford_capx_columns_to_the_right'),
);
- // Do not give all options for the file field. File field processor
- // will take care of most.
- if ($fc_field_info['type'] == "file" || $fc_field_info['type'] == "image") {
- $form['field-mapping'][$collection_container][$field_machine_name][$fc_field_name][0] = array(
- '#type' => 'textfield',
- '#title' => t('File Info'),
- '#description' => t('In your JSON Path selector please pass in the whole array of image information. eg: $.profilePhotos.bigger'),
- '#default_value' => @$mapper->collections[$field_machine_name][$fc_field_name][0],
- );
- continue;
- }
+ // Run through the field.
+ stanford_capx_mapper_form_get_fields_fields($form['field-mapping'][$collection_container][$field_machine_name][$fc_field_name], $form_state, $fc_field_info, $instance_info, $field_machine_name, $mapper);
+
+ }
+
+ }
+ }
+ }
- foreach ($fc_field_info['columns'] as $column_key => $column_info) {
- if (!in_array($column_key, $CAP_RESTRICTED_FIELD_PROPERTIES)) {
- $form['field-mapping'][$collection_container][$field_machine_name][$fc_field_name][$column_key] = array(
- '#type' => 'textfield',
- '#title' => t("@var", array("@var" => $column_key)),
- '#description' => t(@$column_info['description']),
- '#default_value' => @$mapper->collections[$field_machine_name][$fc_field_name][$column_key],
- );
+ // ENTITY REFERENCES
+ // ----------------------------------------------------------------------
- if ($instance_info['required']) {
- $form['field-mapping'][$collection_container][$field_machine_name][$fc_field_name][$column_key]["#attributes"]["class"] = "required";
- }
+ foreach ($references as $entity_machine_name => $bundles) {
+ foreach ($bundles as $bundle_machine_name => $fields) {
- }
- }
- }
+ // Create the container.
+ $reference_container = $entity_machine_name . "-" . $bundle_machine_name . "-references";
+
+ // Fieldset for all fields on this entity -> bundle -> reference field.
+ $form['field-mapping'][$reference_container] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Entity References', array("@name" => $field_machine_name)),
+ '#description' => t(''),
+ '#collapsed' => TRUE,
+ '#collapsible' => TRUE,
+ '#states' => array(
+ 'visible' => array(
+ 'select[name="entity-type"]' => array('value' => $entity_machine_name),
+ 'select[name="bundle-' . $entity_machine_name . '"]' => array('value' => $bundle_machine_name),
+ ),
+ ),
+ );
+
+ // Now loop through the fields.
+ foreach ($fields as $field_machine_name => $field_info) {
+
+ // Get field base and instance information.
+ $field_info_field = field_info_field($field_machine_name);
+ $field_instance_info = field_info_instance($entity_machine_name, $field_machine_name, $bundle_machine_name);
+
+ $form['field-mapping'][$reference_container][$field_machine_name] = array(
+ '#type' => 'container',
+ '#title' => t("@var", array("@var" => $field_instance_info['label'])),
+ '#description' => t("@var", array("@var" => $field_instance_info['description'])),
+ '#field_info' => $field_info_field,
+ '#field_instance_info' => $field_instance_info,
+ '#theme_wrappers' => array('stanford_capx_columns_to_the_right'),
+ );
+
+ // Get this forms fields for the entity/bundle fields.
+ stanford_capx_mapper_form_get_fields_fields($form['field-mapping'][$reference_container][$field_machine_name], $form_state, $field_info_field, $field_instance_info, $field_machine_name, $mapper);
}
}
@@ -592,6 +515,104 @@ function stanford_capx_mapper_form_get_field_mapping_form($form, &$form_state, $
return $form;
}
+/**
+ * [stanford_capx_mapper_form_get_fields_fields description]
+ * @param [type] $form [description]
+ * @param [type] $form_state [description]
+ * @param [type] $field_info_field [description]
+ * @param [type] $field_container [description]
+ * @param [type] $mapper [description]
+ * @return [type] [description]
+ */
+function stanford_capx_mapper_form_get_fields_fields(&$form_tree, &$form_state, $field_info_field, $field_instance_info, $field_machine_name, $mapper) {
+
+ global $CAP_RESTRICTED_FIELD_PROPERTIES;
+
+ // Relation module doesn't have this column key set.
+ if (!isset($field_info_field['columns'])) {
+ return;
+ }
+
+ // FILE FIELD
+ // ---------------------------------------------------------------------------
+ // Do not give all options for the file field. File field processor
+ // will take care of most.
+ if ($field_info_field['type'] == "file" || $field_info_field['type'] == "image") {
+ $form_tree[0] = array(
+ '#type' => 'textfield',
+ '#title' => t('File Information'),
+ '#description' => t('In your JSON Path selector please pass in the whole array of image information. eg: $.profilePhotos.bigger'),
+ '#default_value' => @$mapper->fields[$field_machine_name][0],
+ );
+
+ if ($field_instance_info['required'] && empty($field_instance_info['default_value'])) {
+ $form_tree['#attributes']['class'][] = "required";
+ }
+ return;
+ }
+
+ // ENTITY REFERENCE FIELDS
+ // ---------------------------------------------------------------------------
+ if ($field_info_field['type'] == "entityreference") {
+
+ $importers = CAPxImporter::getAllEntityImporters();
+ $options = array('none' => t("- None -"));
+ $options += array_map('stanford_capx_key_name_array_map', $importers);
+
+ $form_tree[0] = array(
+ '#type' => 'select',
+ '#options' => $options,
+ '#title' => t("Referencing Importer"),
+ '#description' => t("Select the importer with the reference you would like to attach this item to."),
+ '#default_value' => isset($mapper->references[$field_machine_name]) ? $mapper->references[$field_machine_name][0] : '',
+ );
+
+ return;
+ }
+
+
+ // ALL OTHER FIELDS
+ // ---------------------------------------------------------------------------
+
+ foreach ($field_info_field['columns'] as $column_key => $column_info) {
+ if (!in_array($column_key, $CAP_RESTRICTED_FIELD_PROPERTIES)) {
+
+ // Get the default value for the field. If the field was in a field
+ // collection then we need to adjust.
+ $default_value = isset($mapper->fields[$field_machine_name][$column_key]) ? $mapper->fields[$field_machine_name][$column_key] : "";
+ if (isset($field_info_field['bundles']['field_collection_item']) && !empty($field_info_field['bundles']['field_collection_item'])) {
+ if (!empty($mapper->collections[$field_machine_name][$field_info_field['field_name']][$column_key])) {
+ $default_value = $mapper->collections[$field_machine_name][$field_info_field['field_name']][$column_key];
+ }
+ }
+
+ $form_tree[$column_key] = array(
+ '#type' => 'textfield',
+ '#title' => t("@var", array("@var" => $column_key)),
+ '#description' => !empty($column_info['description']) ? t("@var", array("@var" => $column_info['description'])) : "",
+ '#default_value' => $default_value,
+ );
+
+ // Only require a field if it is required and there is no default value.
+ if ($field_instance_info['required'] && empty($field_instance_info['default_value'])) {
+ $form_tree['#attributes']['class'][] = "required";
+ }
+ }
+ }
+
+}
+
+/**
+ * [stanford_capx_key_name_array_map description]
+ * @param [type] $keys [description]
+ * @param [type] $importers [description]
+ * @return [type] [description]
+ */
+function stanford_capx_key_name_array_map($importer) {
+ return $importer->getImporter()->title;
+}
+
+
/**
* [stanford_capx_mapper_machine_name_exits description]
* @param [type] $name [description]
@@ -747,7 +768,7 @@ function stanford_capx_mapper_form_validate($form, $form_state) {
}
// Set the error messages after everything has been looped through.
- stanford_capx_mapper_form_validate_element_set_messages();
+ // stanford_capx_mapper_form_validate_element_set_messages();
// Ensure all required fields were posted. Because of the way the form works
// we cannot place a required on to each of the form element fields as there
@@ -778,7 +799,6 @@ function stanford_capx_mapper_form_validate_required_fields(&$form, &$form_state
// Get all the properties of the entity type.
$entity_info = entity_get_property_info($entity);
$properties = $entity_info['properties'];
-
$fields = isset($entity_info['bundles']) ? $entity_info['bundles'][$bundle]['properties'] : array();
// Properties validation.
@@ -792,17 +812,31 @@ function stanford_capx_mapper_form_validate_required_fields(&$form, &$form_state
// Field validation.
foreach ($fields as $field_name => $value) {
+ // Check if the value is required.
if (isset($value['required']) && $value['required']) {
+ // Check if the value exists.
if (!isset($form_state['values']['field-mapping'][$entity . "-" . $bundle . "-fields"][$field_name])) {
continue;
}
+ // Check if there is a required class on the field as we add this to
+ // bypass the multiple hide/show options and required fields.
+ if (!isset($form['field-mapping'][$entity . "-" . $bundle . "-fields"]['#attributes']['class'])) {
+ continue;
+ }
+
+ // No css class, no need to validate.
+ if (!in_array("required", $form['field-mapping'][$entity . "-" . $bundle . "-fields"]['#attributes']['class'])) {
+ continue;
+ }
+
+
$columns = $form_state['values']['field-mapping'][$entity . "-" . $bundle . "-fields"][$field_name];
// Loop through the columns and check for values.
foreach ($columns as $column_name => $value) {
- if (empty($value) && $column_name != 'summary') {
+ if (empty($value) && $column_name !== 'summary') {
$element = "field-mapping][" . $entity . "-" . $bundle . "-" . "fields][" . $field_name . "][" . $column_name;
form_set_error($element, t("@name field is required", array("@name" => $field_name)));
break;
@@ -874,32 +908,32 @@ function stanford_capx_mapper_form_validate_element($element, $parents = array()
/**
* Sets the message for the element validation.
*/
-function stanford_capx_mapper_form_validate_element_set_messages() {
- $form_error = &drupal_static("stanford_capx_mapper_form_validate_element_error", FALSE);
- $form_field_warnings = &drupal_static("stanford_capx_mapper_form_validate_element_warnings", FALSE);
-
- // Set the error message once when the recursive calls have finished.
- if ($form_error) {
- $field_warnings_list = theme('item_list', array(
- 'title' => '',
- 'items' => $form_field_warnings,
- 'type' => 'ul',
- 'attributes' => array()
- ));
- $browser_link = l(t('Data Browser'),
- 'admin/config/capx/data-browser', array(
- 'attributes' => array('target' => '_blank')
- ));
-
- drupal_set_message(
- t('The following selectors did not match an element in the profile schema but may be valid. If you know the selector is valid please disregard this message. Try using the !databrowser to find a valid selector.!warnings',
- array(
- '!warnings' => $field_warnings_list,
- '!databrowser' => $browser_link,
- )
- ), 'warning');
- }
-}
+// function stanford_capx_mapper_form_validate_element_set_messages() {
+// $form_error = &drupal_static("stanford_capx_mapper_form_validate_element_error", FALSE);
+// $form_field_warnings = &drupal_static("stanford_capx_mapper_form_validate_element_warnings", FALSE);
+
+// // Set the error message once when the recursive calls have finished.
+// if ($form_error) {
+// $field_warnings_list = theme('item_list', array(
+// 'title' => '',
+// 'items' => $form_field_warnings,
+// 'type' => 'ul',
+// 'attributes' => array()
+// ));
+// $browser_link = l(t('Data Browser'),
+// 'admin/config/capx/data-browser', array(
+// 'attributes' => array('target' => '_blank')
+// ));
+
+// drupal_set_message(
+// t('The following selectors did not match an element in the profile schema but may be valid. If you know the selector is valid please disregard this message. Try using the !databrowser to find a valid selector.!warnings',
+// array(
+// '!warnings' => $field_warnings_list,
+// '!databrowser' => $browser_link,
+// )
+// ), 'warning');
+// }
+// }
/**
* Submit handler for the mapper form. Create and save the mapper entity.
@@ -924,12 +958,16 @@ function stanford_capx_mapper_form_submit($form, $form_state) {
$settings['fields'] = array();
$settings['properties'] = array();
$settings['collections'] = array();
+ $settings['references'] = array();
$entity = $values['entity-type'];
$bundle = $values['bundle-' . $entity];
$settings['entity_type'] = $entity;
$settings['bundle_type'] = $bundle;
+ $settings['multiple'] = $values['multiple-entities'];
+ $settings['subquery'] = $values['subquery'];
+ $settings['guuidquery'] = $values['guuid-query'];
// If there are properties...
$properties = @$values['field-mapping'][$entity . "-properties"];
@@ -943,6 +981,13 @@ function stanford_capx_mapper_form_submit($form, $form_state) {
$settings['fields'] = $fields;
}
+ // If there are collections...
+ $references = @$values['field-mapping'][$entity . "-" . $bundle . "-references"];
+ // We have values!
+ if (!empty($references)) {
+ $settings['references'] = $references;
+ }
+
// If there are collections...
$collections = @$values['field-mapping'][$entity . "-" . $bundle . "-collections"];
@@ -1373,6 +1418,43 @@ function stanford_capx_importer_form($form, &$form_state, $importer = NULL) {
return $form;
}
+/**
+ * [stanford_capx_config_settings_data_sync_form description]
+ * @param [type] $form [description]
+ * @param [type] $form_state [description]
+ * @return [type] [description]
+ */
+function stanford_capx_config_settings_data_sync_form($form, $form_state) {
+ $form['orggroup'] = array(
+ '#type' => "fieldset",
+ '#title' => t("Organizations & Schema"),
+ '#description' => t("The CAPx module needs some information from the CAP API in order to function properly. Below are actions that require communication with the CAP API server and you must be connected before you can run these tasks."),
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ );
+
+ // Organizations.
+ $form['orggroup']['orgcodeinfo']['#markup'] = "Organizations
";
+ $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("Organization codes come from the CAP API and are saved to a taxonomy. This taxonomy powers the organization code autocomplete in the import section.") . "
";
+ $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("Last sync: @date", array("@date" => variable_get('capx_last_orgs_sync', 'never'))) . "
";
+ $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("View all organization codes: !link", array("!link" => l(t('Organization taxonomy'), 'admin/structure/taxonomy/capx_organizations'))) . "
";
+ $form['orggroup']['orgcodeinfo']['#markup'] .= "" . l(t('Get organization data'), 'admin/config/capx/organizations/sync', array("attributes" => array('class' => array('btn button')), 'query' => array('destination' => current_path()))) . "
";
+
+ // Schema.
+ $form['orggroup']['schemainfo']['#markup'] = "
Schema Information
";
+ $form['orggroup']['schemainfo']['#markup'] .= "" . t("The CAP API provides a schema of the information available. The CAPx module needs this in order to power the data browser that is found on a mapping page.") . "
";
+ $form['orggroup']['schemainfo']['#markup'] .= "" . t("Last sync: @date", array("@date" => variable_get('capx_last_schema_sync', 'never'))) . "
";
+ $form['orggroup']['submit'] = array(
+ '#type' => 'button',
+ '#value' => 'Get schema information',
+ '#op' => 'submit',
+ // '#element_validate' => array("stanford_capx_schema_refresh"), // Yes, I know this is abuse.
+ );
+
+ // $form['#submit'][] = "stanford_capx_schema_refresh";
+ return $form;
+}
+
/**
* AJAX callback.
*/
@@ -1546,7 +1628,7 @@ function stanford_capx_admin_config_importer_delete($form, &$form_state, $machin
$form['profile_action'] = array(
'#type' => 'select',
'#title' => t('What would you like to do with the items that are associated with this importer?'),
-// '#description' => t('Perform an action on all of the items that have been imported by this importer.'),
+ // '#description' => t('Perform an action on all of the items that have been imported by this importer.'),
'#options' => array(
'nothing' => t('Do nothing and leave the items as they are'),
'delete' => t('Delete all of the items'),
@@ -1924,6 +2006,70 @@ function stanford_capx_schema_format_validation($schema = NULL) {
return $formatted_schema;
}
+/**
+ * Auth settings form. Was previously the connect page.
+ * @param [type] $form [description]
+ * @param [type] &$form_state [description]
+ * @return [type] [description]
+ */
+function stanford_capx_config_auth_settings_form($form, &$form_state) {
+ $username = CAPx::getAuthUsername();
+ $connection = CAPxConnection::testConnection();
+
+ $form['auth'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Authorization'),
+ '#collapsible' => TRUE,
+ '#collapsed' => $connection->status,
+ '#weight' => -10,
+ );
+
+ $form['auth']['description'] = array(
+ '#markup' => t('Please enter your authentication information for the CAP API. If you don\'t have these credentials yet you can !helpsu.', array('!helpsu' => l("File a HelpSU request", "https://helpsu.stanford.edu/helpsu/3.0/auth/helpsu-form?pcat=CAP_API&dtemplate=CAP-OAuth-Info"))),
+ );
+
+ $form['auth']['stanford_capx_username'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Client ID:'),
+ '#default_value' => $username,
+ '#required' => TRUE,
+ );
+
+ $form['auth']['stanford_capx_password'] = array(
+ '#type' => 'password',
+ '#title' => t('Password:'),
+ );
+
+ $form['advanced'] = array(
+ '#type' => 'fieldset',
+ '#title' => t('Advanced'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#description' => t('Advanced setting for CAP API and authentication URIs'),
+ '#access' => user_access("capx advanced administrator"),
+ );
+
+ $form['advanced']['stanford_capx_api_base_url'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Endpoint'),
+ '#description' => t('CAP API endpoint URI, only useful when switching between development/production environment.'),
+ '#default_value' => CAPx::getAPIEndpoint(),
+ '#required' => TRUE,
+ );
+
+ $form['advanced']['stanford_capx_api_auth_uri'] = array(
+ '#type' => 'textfield',
+ '#title' => t('Authentication URI'),
+ '#description' => t('CAP API authentication URI.'),
+ '#default_value' => CAPx::getAuthEndpoint(),
+ '#required' => TRUE,
+ );
+
+ $form['#validate'][] = "stanford_capx_forms_connect_form_validate";
+ $form['#submit'][] = "stanford_capx_forms_connect_form_submit";
+
+ return $form;
+}
/**
* The global configuration settings for CAPx form builder.
@@ -1959,11 +2105,23 @@ function stanford_capx_config_settings_form($form, &$form_state) {
'#default_value' => variable_get('stanford_capx_default_field_format', 'filtered_html'),
);
- $form = system_settings_form($form);
- $form['actions']['submit']['#value'] = t("Save settings");
+ $form["#submit"][] = "stanford_capx_config_settings_form_submit";
+
return $form;
}
+/**
+ * Submit function for stanford_capx_config_settings_form
+ * @param [type] $form [description]
+ * @param [type] &$form_state [description]
+ * @return [type] [description]
+ */
+function stanford_capx_config_settings_form_submit($form, &$form_state) {
+ $values = $form_state["values"];
+ variable_set("stanford_capx_batch_limit", check_plain($values['stanford_capx_batch_limit']));
+ variable_set("stanford_capx_default_field_format", check_plain($values['stanford_capx_default_field_format']));
+}
+
/**
* Validates wether or not a path is acceptible.
*
diff --git a/stanford_capx.info b/stanford_capx.info
index 3ce9d958..8e2383fe 100644
--- a/stanford_capx.info
+++ b/stanford_capx.info
@@ -3,7 +3,8 @@ description = Provides the ability to import profiles into existing entity types
core = 7.x
package = Stanford CAPx
project = stanford_capx
-version = 7.x-1.3-php54
+version = 7.x-2.x-php54
+
dependencies[] = entity
dependencies[] = block
diff --git a/stanford_capx.install b/stanford_capx.install
index f9ed1bc2..4fef21b5 100644
--- a/stanford_capx.install
+++ b/stanford_capx.install
@@ -21,6 +21,8 @@ function stanford_capx_uninstall() {
variable_del('stanford_capx_token');
variable_del("capx_last_orgs_sync");
variable_del("capx_last_schema_sync");
+ variable_del("stanford_capx_debug_always_force_etag");
+ variable_del("stanford_capx_autotruncate_textfields");
}
/**
@@ -76,6 +78,12 @@ function stanford_capx_schema() {
'not null' => TRUE,
'default' => '',
),
+ 'guuid' => array(
+ 'description' => 'A guuid that is not the profile id. Used for multiple creation.',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ ),
'sync' => array(
'description' => 'Does this profile needs to be synced?',
'type' => 'int',
@@ -103,7 +111,7 @@ function stanford_capx_schema() {
),
);
- // Configuration Entity
+ // Configuration Entity.
$schema['capx_cfe'] = array(
'description' => 'The base table for configuration entities.',
'fields' => array(
@@ -266,3 +274,22 @@ function stanford_capx_requirements($phase) {
}
return $requirements;
}
+
+/**
+ * Add the guuid field to the capx_profiles table.
+ */
+function stanford_capx_update_7100() {
+
+ $table = "capx_profiles";
+ $field = "guuid";
+ $spec = array(
+ 'description' => 'A guuid that is not the profile id. Used for multiple creation.',
+ 'type' => 'varchar',
+ 'length' => 255,
+ 'not null' => TRUE,
+ 'default' => '',
+ );
+
+ db_add_field($table, $field, $spec);
+
+}
diff --git a/stanford_capx.module b/stanford_capx.module
index 53ee0600..2dc87315 100644
--- a/stanford_capx.module
+++ b/stanford_capx.module
@@ -69,7 +69,19 @@ function stanford_capx_permission() {
return array(
'administer capx' => array(
'title' => t('Administer CAPx'),
- 'description' => t('Administer and Configure CAPx settings.'),
+ 'description' => t('Administer and configure CAPx settings.'),
+ ),
+ // 'capx administer importers' => array(
+ // 'title' => t('Administer CAPx Importers'),
+ // 'description' => t('Administer and configure CAPx importers.'),
+ // ),
+ // 'capx administer mappers' => array(
+ // 'title' => t('Administer CAPx Mappers'),
+ // 'description' => t('Administer and configure CAPx mappers.'),
+ // ),
+ 'capx advanced administrator' => array(
+ 'title' => t('Administer Advanced CAPx settings'),
+ 'description' => t('Administer and Ccnfigure CAPx advanced settings.'),
),
);
}
@@ -109,15 +121,6 @@ function stanford_capx_menu() {
'type' => MENU_NORMAL_ITEM,
);
- // Connect page.
- $items['admin/config/capx/connect'] = array(
- 'title' => 'Connect',
- 'page callback' => 'stanford_capx_admin_config_connect',
- 'access arguments' => array('administer capx'),
- 'type' => MENU_NORMAL_ITEM,
- 'weight' => -10,
- );
-
// Settings Page.
$items['admin/config/capx/settings'] = array(
'title' => 'Settings',
diff --git a/stanford_capx.pages.inc b/stanford_capx.pages.inc
index da96f8aa..6f0a14af 100644
--- a/stanford_capx.pages.inc
+++ b/stanford_capx.pages.inc
@@ -83,53 +83,36 @@ function stanford_capx_admin_config_settings() {
drupal_set_message(t('The organization codes are not available. You should sync with the API now.'), 'warning', FALSE);
}
- // Organizations
- // ---------------------------------------------------------------------------
+ $form = drupal_get_form("stanford_capx_admin_config_settings_get_all_the_forms_form");
- $form = drupal_get_form("stanford_capx_config_settings_data_sync_form");
- $output['content']["orgsform"] = $form;
-
- // Settings form
- // ---------------------------------------------------------------------------
-
- $form = drupal_get_form('stanford_capx_config_settings_form');
- $output["content"]["settingsform"] = $form;
+ $output['content']['submitbuttons'] = $form;
return $output;
}
/**
- * [stanford_capx_config_settings_data_sync_form description]
+ * Returns all the forms that make up the settings page.
* @param [type] $form [description]
* @param [type] $form_state [description]
* @return [type] [description]
*/
-function stanford_capx_config_settings_data_sync_form($form, $form_state) {
- $form['orggroup'] = array(
- '#type' => "fieldset",
- '#title' => t("Organizations & Schema"),
- '#description' => t("The CAPx module needs some information from the CAP API in order to function properly. Below are actions that require communication with the CAP API server and you must be connected before you can run these tasks."),
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- );
+function stanford_capx_admin_config_settings_get_all_the_forms_form($form, &$form_state) {
+
+ // $form = system_settings_form($form);
+ $form = stanford_capx_config_auth_settings_form($form, $form_state);
- // Organizations.
- $form['orggroup']['orgcodeinfo']['#markup'] = "Organizations
";
- $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("Organization codes come from the CAP API and are saved to a taxonomy. This taxonomy powers the organization code autocomplete in the import section.") . "
";
- $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("Last sync: @date", array("@date" => variable_get('capx_last_orgs_sync', 'never'))) . "
";
- $form['orggroup']['orgcodeinfo']['#markup'] .= "" . t("View all organization codes: !link", array("!link" => l(t('Organization taxonomy'), 'admin/structure/taxonomy/capx_organizations'))) . "
";
- $form['orggroup']['orgcodeinfo']['#markup'] .= "" . l(t('Get organization data'), 'admin/config/capx/organizations/sync', array("attributes" => array('class' => array('btn button')), 'query' => array('destination' => current_path()))) . "
";
-
- // Schema.
- $form['orggroup']['schemainfo']['#markup'] = "
Schema Information
";
- $form['orggroup']['schemainfo']['#markup'] .= "" . t("The CAP API provides a schema of the information available. The CAPx module needs this in order to power the data browser that is found on a mapping page.") . "
";
- $form['orggroup']['schemainfo']['#markup'] .= "" . t("Last sync: @date", array("@date" => variable_get('capx_last_schema_sync', 'never'))) . "
";
- $form['orggroup']['submit'] = array(
+ $connection = CAPxConnection::testConnection();
+ if ($connection->status) {
+ $form = stanford_capx_config_settings_form($form, $form_state);
+ $form = stanford_capx_config_settings_data_sync_form($form, $form_state);
+ }
+
+
+ $form['actions']['submit'] = array(
+ '#value' => t("Save settings"),
'#type' => 'submit',
- '#value' => 'Get schema information',
- '#op' => 'submit',
);
- $form['#submit'][] = "stanford_capx_schema_refresh";
+
return $form;
}
@@ -167,7 +150,7 @@ function stanford_capx_admin_config_help() {
$content = "" . t("Getting started") . "
";
$content .= "" . t("Importing content from CAP can be completed in 3 steps:") . "
";
$content .= "- ";
- $content .= t("!connect - Connect to the CAP API using your authentication credentials.", array("!connect" => l(t("Connect"), "admin/config/capx/connect")));
+ $content .= t("!connect - Connect to the CAP API using your authentication credentials.", array("!connect" => l(t("Settings"), "admin/config/capx/settings")));
$content .= "
- ";
$content .= t("!mapping - Create a mapping that links CAP fields to your own fields.", array("!mapping" => l(t("Mapping"), "admin/config/capx/mapper")));
$content .= "
- ";
diff --git a/stanford_capx.theme.inc b/stanford_capx.theme.inc
index 3c99cd0e..c21eeb18 100644
--- a/stanford_capx.theme.inc
+++ b/stanford_capx.theme.inc
@@ -53,7 +53,6 @@ function theme_stanford_capx_columns_to_the_right($elements) {
$req = "" . t("TRUE") . "";
$element['#children'] = preg_replace("/\<\/label>/", " *$0", $element['#children']);
}
- $info .= "
Required: " . $req . "
";
// Set up the rows even though there will only be one.
$rows = array();