diff --git a/profiles/dkan/CHANGELOG.txt b/profiles/dkan/CHANGELOG.txt index 8d8f9119816..8d638b2129f 100644 --- a/profiles/dkan/CHANGELOG.txt +++ b/profiles/dkan/CHANGELOG.txt @@ -1,3 +1,8 @@ +7.x-1.18.12 +----------- +- #3244 Periodic Updates enhancement: force import of particular resources on +next cron runs. + 7.x-1.18.11 ----------- - #3211 Drupal security upgrade to version 7.73. diff --git a/profiles/dkan/README.md b/profiles/dkan/README.md index 87d4d0081fd..4c2c6834ec2 100644 --- a/profiles/dkan/README.md +++ b/profiles/dkan/README.md @@ -1,4 +1,4 @@ -# DKAN Open Data Platform (7.x-1.18.11) +# DKAN Open Data Platform (7.x-1.18.12) DKAN is an open source open data platform with a full suite of cataloging, publishing and visualization features that allow organizations to easily publish data to the public. diff --git a/profiles/dkan/dkan.info b/profiles/dkan/dkan.info index 484ca0d4674..ecc6e69597f 100644 --- a/profiles/dkan/dkan.info +++ b/profiles/dkan/dkan.info @@ -127,4 +127,4 @@ dependencies[] = dkan_datastore_simple_import dependencies[] = dkan_datastore_api dependencies[] = open_data_schema_map_dkan dependencies[] = visualization_entity_charts_dkan -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info b/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info index abb8516a882..b64f668d2c0 100644 --- a/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info +++ b/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info @@ -30,4 +30,4 @@ features[variable][] = panelizer_node:data_dashboard_default features[views_view][] = data_dashboards features[views_view][] = front_page_dashboards_list features_exclude[dependencies][dkan_topics] = dkan_topics -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info b/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info index bbe96dcdc15..bd5fcd6923f 100644 --- a/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info +++ b/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info @@ -53,4 +53,4 @@ features_exclude[dependencies][image] = image features_exclude[dependencies][strongarm] = strongarm features_exclude[dependencies][taxonomy] = taxonomy no autodetect = 1 -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info b/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info index eca1c441a41..728870eb877 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info @@ -33,4 +33,4 @@ features[ctools][] = views:views_default:3.0 features[features_api][] = api:2 features[variable][] = pathauto_node_dataset_pattern features[variable][] = pathauto_node_resource_pattern -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info index 5044edc1606..2ad0a40875f 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info @@ -125,4 +125,4 @@ features_exclude[dependencies][og] = og features_exclude[dependencies][dkan_featured_topics] = dkan_featured_topics features_exclude[field_base][og_group_ref] = og_group_ref features_exclude[field_instance][node-dataset-og_group_ref] = node-dataset-og_group_ref -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info index df3455e90c7..aad832d5853 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info @@ -74,4 +74,4 @@ features[views_view][] = front_page_group_grid features[views_view][] = front_page_group_list features[views_view][] = group_block features[views_view][] = groups_page -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/modules/dkan_dataset_groups_perms/dkan_dataset_groups_perms.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/modules/dkan_dataset_groups_perms/dkan_dataset_groups_perms.info index 5741b48c6b4..6ac7fff0390 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/modules/dkan_dataset_groups_perms/dkan_dataset_groups_perms.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/modules/dkan_dataset_groups_perms/dkan_dataset_groups_perms.info @@ -32,4 +32,4 @@ features[og_features_permission][] = node:group:update own dataset content features[og_features_permission][] = node:group:update own resource content features[og_features_permission][] = node:group:view any unpublished dataset content features[og_features_permission][] = node:group:view any unpublished resource content -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info index d910d8899f7..26d57febe29 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info @@ -10,4 +10,4 @@ dependencies[] = services features[ctools][] = services:services:3 features[features_api][] = api:2 features[services_endpoint][] = dkan_dataset_api -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info index f5b1be85f8d..bb409d9fb04 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info @@ -17,4 +17,4 @@ features[field_instance][] = comment-comment_node_dataset-field_rating features[field_instance][] = node-dataset-field_rating features[variable][] = ajax_comments_node_types features[variable][] = ajax_comments_notify -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_dataset/tests/dkan_dataset_test.info b/profiles/dkan/modules/dkan/dkan_dataset/tests/dkan_dataset_test.info index 21e86579939..34942ff93f3 100644 --- a/profiles/dkan/modules/dkan/dkan_dataset/tests/dkan_dataset_test.info +++ b/profiles/dkan/modules/dkan/dkan_dataset/tests/dkan_dataset_test.info @@ -4,4 +4,4 @@ core = 7.x dependencies[] = dkan_dataset dependencies[] = dkan_dataset_rest_api hidden = TRUE -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info b/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info index aff99fae5bb..520958aa65d 100644 --- a/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info +++ b/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info @@ -12,4 +12,4 @@ features[features_api][] = api:2 features[field_base][] = field_datastore_status features[field_instance][] = node-resource-field_datastore_status features[views_view][] = datasets -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info index c884af1c2e1..711853c424b 100644 --- a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info +++ b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info @@ -4,4 +4,4 @@ package = DKAN API core = 7.x dependencies[] = services dependencies[] = dkan_datastore -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info index 14e81ff813c..bbdc838c073 100644 --- a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info +++ b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info @@ -3,4 +3,4 @@ description = Enable fast import for resources core = 7.x package = DKAN dependencies[] = dkan_datastore -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_simple_import/dkan_datastore_simple_import.info b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_simple_import/dkan_datastore_simple_import.info index b01b1f0f92f..43fa5f007e0 100644 --- a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_simple_import/dkan_datastore_simple_import.info +++ b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_simple_import/dkan_datastore_simple_import.info @@ -3,4 +3,4 @@ description = A datastore importer that uses MySQL insert statements, and a cust core = 7.x package = DKAN dependencies[] = dkan_datastore -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_environment/dkan_environment.info b/profiles/dkan/modules/dkan/dkan_environment/dkan_environment.info index dc8aac94fa7..66613887f2e 100755 --- a/profiles/dkan/modules/dkan/dkan_environment/dkan_environment.info +++ b/profiles/dkan/modules/dkan/dkan_environment/dkan_environment.info @@ -3,4 +3,4 @@ description = Basic environments management (Local, Development, Production, etc core = 7.x dependencies[] = environment dependencies[] = environment_indicator -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_fixtures/dkan_fixtures.info b/profiles/dkan/modules/dkan/dkan_fixtures/dkan_fixtures.info index 448813f3ba7..e1a3db90361 100644 --- a/profiles/dkan/modules/dkan/dkan_fixtures/dkan_fixtures.info +++ b/profiles/dkan/modules/dkan/dkan_fixtures/dkan_fixtures.info @@ -14,4 +14,4 @@ files[] = includes/page.inc files[] = includes/panelized_node.inc files[] = includes/resource.inc files[] = includes/visualization_entity.inc -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_harvest/dkan_harvest.info b/profiles/dkan/modules/dkan/dkan_harvest/dkan_harvest.info index a21b782e351..2370f0a4755 100644 --- a/profiles/dkan/modules/dkan/dkan_harvest/dkan_harvest.info +++ b/profiles/dkan/modules/dkan/dkan_harvest/dkan_harvest.info @@ -73,4 +73,4 @@ files[] = includes/HarvestCache.php files[] = includes/HarvestMigrateSQLMap.php files[] = includes/HarvestMigrateSourceList.php files[] = includes/XmlHarvestMigration.php -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_dashboard/dkan_harvest_dashboard.info b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_dashboard/dkan_harvest_dashboard.info index 7a5cdfacb8a..a344b8dfdfb 100644 --- a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_dashboard/dkan_harvest_dashboard.info +++ b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_dashboard/dkan_harvest_dashboard.info @@ -23,4 +23,4 @@ features[views_view][] = dkan_harvest_datasets files[] = views/handlers/views_handler_field_date_harvest_date.inc files[] = views/handlers/views_handler_field_numeric_harvest_count.inc files[] = views/handlers/views_handler_field_harvest_status.inc -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_datajson/dkan_harvest_datajson.info b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_datajson/dkan_harvest_datajson.info index 422c8bc6906..259445069dc 100644 --- a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_datajson/dkan_harvest_datajson.info +++ b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_datajson/dkan_harvest_datajson.info @@ -5,4 +5,4 @@ core = 7.x dependencies[] = dkan_harvest files[] = dkan_harvest_datajson.migrate.inc -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_test/dkan_harvest_test.info b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_test/dkan_harvest_test.info index 952ca30f7dc..eb866b477bc 100644 --- a/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_test/dkan_harvest_test.info +++ b/profiles/dkan/modules/dkan/dkan_harvest/modules/dkan_harvest_test/dkan_harvest_test.info @@ -3,4 +3,4 @@ description = Test module for dkan_harvest core = 7.x dependencies[] = 'dkan_harvest' -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_ipe/dkan_ipe.info b/profiles/dkan/modules/dkan/dkan_ipe/dkan_ipe.info index 034c3dbb0cf..5643c82fe0c 100644 --- a/profiles/dkan/modules/dkan/dkan_ipe/dkan_ipe.info +++ b/profiles/dkan/modules/dkan/dkan_ipe/dkan_ipe.info @@ -8,4 +8,4 @@ dependencies[] = panels dependencies[] = strongarm features[features_api][] = api:2 project path = profiles/dkan/modules/dkan -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_linkchecker/dkan_linkchecker.info b/profiles/dkan/modules/dkan/dkan_linkchecker/dkan_linkchecker.info index f18eb6b191c..209dc8ecccb 100644 --- a/profiles/dkan/modules/dkan/dkan_linkchecker/dkan_linkchecker.info +++ b/profiles/dkan/modules/dkan/dkan_linkchecker/dkan_linkchecker.info @@ -22,4 +22,4 @@ features[variable][] = linkchecker_scan_node_resource features[views_view][] = dkan_linkchecker_reports features_exclude[dependencies][ctools] = ctools project path = profiles/dkan/modules/dkan -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_migrate_base/dkan_migrate_base.info b/profiles/dkan/modules/dkan/dkan_migrate_base/dkan_migrate_base.info index 4887da4fac8..5e5796066df 100644 --- a/profiles/dkan/modules/dkan/dkan_migrate_base/dkan_migrate_base.info +++ b/profiles/dkan/modules/dkan/dkan_migrate_base/dkan_migrate_base.info @@ -11,4 +11,4 @@ files[] = dkan_migrate_base_group.inc files[] = dkan_migrate_base_dataset.inc files[] = dkan_migrate_base_resource.inc files[] = dkan_migrate_base_data_json.inc -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_migrate_base/modules/dkan_migrate_base_example/dkan_migrate_base_example.info b/profiles/dkan/modules/dkan/dkan_migrate_base/modules/dkan_migrate_base_example/dkan_migrate_base_example.info index 71b1e8d7f21..00e9c5fa4fb 100644 --- a/profiles/dkan/modules/dkan/dkan_migrate_base/modules/dkan_migrate_base_example/dkan_migrate_base_example.info +++ b/profiles/dkan/modules/dkan/dkan_migrate_base/modules/dkan_migrate_base_example/dkan_migrate_base_example.info @@ -4,4 +4,4 @@ package = "DKAN" core = 7.x dependencies[] = dkan_migrate_base dependencies[] = open_data_federal_extras -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.info b/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.info index 81ce0275561..42a022849da 100644 --- a/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.info +++ b/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.info @@ -4,4 +4,4 @@ core = 7.x package = DKAN dependencies[] = dkan_dataset dependencies[] = dkan_datastore -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.module b/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.module index 9374b3d8e2e..88f93865512 100644 --- a/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.module +++ b/profiles/dkan/modules/dkan/dkan_periodic_updates/dkan_periodic_updates.module @@ -38,6 +38,14 @@ function dkan_periodic_updates_menu() { 'access arguments' => ['administer periodic updates'], 'type' => MENU_LOCAL_TASK, ]; + $items['admin/dkan/periodic-updates/reset'] = [ + 'title' => t('Reset'), + 'page callback' => 'drupal_get_form', + 'page arguments' =>['dkan_periodic_updates_reset_form'], + 'access arguments' => ['administer periodic updates'], + 'type' => MENU_LOCAL_TASK, + 'weight' => 1 + ]; return $items; } @@ -408,6 +416,92 @@ function dkan_periodic_updates_state() { return $output; } + +/** + * Page callback for periodic updates reset page. + * + * @param $form + * @param $form_state + * + * @return mixed + */ +function dkan_periodic_updates_reset_form($form, &$form_state) { + $active = variable_get('dkan_periodic_updates_status'); + if ($active) { + $file = variable_get('dkan_periodic_updates_manifest'); + $file = file_load($file); + if ($file) { + $handle = fopen($file->uri, 'r'); + $manifest_options = []; + $headers = fgetcsv($handle, 0, ','); + while (($data = fgetcsv($handle, 0, ",")) !== FALSE) { + $resource_data = array_combine($headers, $data); + if (!empty(variable_get('dkan_periodic_updates_' . $resource_data['resource_id'], ''))) { + $manifest_options[$resource_data['resource_id']] = $resource_data['file_url']; + } + } + fclose($handle); + + if (empty($manifest_options)) { + $form['state'] = [ + '#markup' => '

' . t('There is nothing to reset, no resource has been imported.') . '

', + ]; + return $form; + } + $form['resource_id'] = [ + '#type' => 'select', + '#empty_option' => t('Select an option'), + '#title' => t('Resource'), + '#options' => $manifest_options, + '#description' => t('Select the resource to force import in the next cron execution.'), + '#required' => TRUE, + ]; + + $form['reset'] = [ + '#type' => 'submit', + '#value' => t('Reset'), + ]; + + } + else { + $form['state'] = [ + '#markup' => '

' . t('No manifest was found.') . '

', + ]; + } + } + else { + $form['state'] = [ + '#markup' => '

' . t('Periodic updates are disabled.') . '

', + ]; + } + + return $form; +} + +/** + * Validate function for periodic updates reset form. + * + * @param $form + * @param $form_state + */ +function dkan_periodic_updates_reset_form_validate($form, &$form_state) { + if (empty(variable_get('dkan_periodic_updates_' . $form_state['values']['resource_id'], ''))) { + form_set_error('resource_id', t('The resource has not been update')); + } +} + +/** + * Submit function for periodic updates reset form. + * + * @param $form + * @param $form_state + */ +function dkan_periodic_updates_reset_form_submit($form, &$form_state) { + variable_set('dkan_periodic_updates_' . $form_state['values']['resource_id'], ''); + drupal_set_message(t('Timing of the resource has been reset')); + $form_state['redirect'] = 'admin/dkan/periodic-updates/status'; +} + /** * Helper function to get file contents. */ diff --git a/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.info b/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.info index 858f2e388e0..7cc2513799e 100644 --- a/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.info +++ b/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.info @@ -11,4 +11,4 @@ features[roles_permissions][] = editor features[roles_permissions][] = site manager features_exclude[dependencies][features] = features project path = profiles/dkan/modules/dkan -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_plugins/dkan_plugins.info b/profiles/dkan/modules/dkan/dkan_plugins/dkan_plugins.info index 409a5439e1f..02d93dde7a1 100644 --- a/profiles/dkan/modules/dkan/dkan_plugins/dkan_plugins.info +++ b/profiles/dkan/modules/dkan/dkan_plugins/dkan_plugins.info @@ -6,4 +6,4 @@ dependencies[] = ctools dependencies[] = panels project path = profiles/dkan/modules/dkan scripts[] = js/colorPicker.behavior.js -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/dkan_sitewide.info b/profiles/dkan/modules/dkan/dkan_sitewide/dkan_sitewide.info index 9650d46144f..87cf65477bb 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/dkan_sitewide.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/dkan_sitewide.info @@ -56,4 +56,4 @@ features[views_view][] = dkan_administration_files features[views_view][] = dkan_administration_nodes features[views_view][] = dkan_administration_users features[views_view][] = popular_tags -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_context/dkan_sitewide_context.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_context/dkan_sitewide_context.info index 8acd776ce7e..d97f7765931 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_context/dkan_sitewide_context.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_context/dkan_sitewide_context.info @@ -19,4 +19,4 @@ features[context][] = sitewide features[ctools][] = context:context:3 features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:2 -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_demo_front/dkan_sitewide_demo_front.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_demo_front/dkan_sitewide_demo_front.info index f63e559f7b4..9779a3b6038 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_demo_front/dkan_sitewide_demo_front.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_demo_front/dkan_sitewide_demo_front.info @@ -9,4 +9,4 @@ features[ctools][] = context:context:3 features[ctools][] = page_manager:pages_default:1 features[features_api][] = api:2 fetures[context][] = front -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_menu/dkan_sitewide_menu.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_menu/dkan_sitewide_menu.info index 38329259157..8a03b74d0bd 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_menu/dkan_sitewide_menu.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_menu/dkan_sitewide_menu.info @@ -44,4 +44,4 @@ features[menu_links][] = menu-command-center-menu_site-information:admin/config/ features[menu_links][] = menu-command-center-menu_taxonomy:admin/structure/taxonomy features[menu_links][] = menu-command-center-menu_visualization:admin/structure/entity-type/visualization/ve_chart/add features[menu_links][] = menu-command-center-menu_visualizations:admin/structure/entity-type/visualization -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panelizer/dkan_sitewide_panelizer.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panelizer/dkan_sitewide_panelizer.info index e29248bf033..f6adb06593a 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panelizer/dkan_sitewide_panelizer.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panelizer/dkan_sitewide_panelizer.info @@ -17,4 +17,4 @@ features[variable][] = panelizer_node:page_allowed_layouts_default features[variable][] = panelizer_node:page_allowed_types features[variable][] = panelizer_node:page_allowed_types_default features[variable][] = panelizer_node:page_default -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.info index 3efa2473c16..1a21e0d2dbd 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_panels/dkan_sitewide_panels.info @@ -48,4 +48,4 @@ features[views_view][] = dkan_datasets_filtered features[views_view][] = dkan_groups features[views_view][] = entity_reference_groups_list features[views_view][] = list_of_users_groups -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info index c1a6be2210e..558fd194902 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_search_db/dkan_sitewide_search_db.info @@ -18,4 +18,4 @@ features[features_api][] = api:2 features[search_api_server][] = datasets features[variable][] = facetapi_pretty_paths_searcher_search_api@datasets features[variable][] = facetapi_pretty_paths_searcher_search_api@datasets_options -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_user/dkan_sitewide_user.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_user/dkan_sitewide_user.info index 988e5e529f3..a823ec2fade 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_user/dkan_sitewide_user.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/dkan_sitewide_user/dkan_sitewide_user.info @@ -21,4 +21,4 @@ features[field_group][] = group_user_tabs|user|user|default features[field_instance][] = user-user-field_about features[views_view][] = user_profile_fields features[views_view][] = user_profile_search -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_sitewide/modules/facet_icons/facet_icons.info b/profiles/dkan/modules/dkan/dkan_sitewide/modules/facet_icons/facet_icons.info index 4d0e0770785..2401843aa68 100644 --- a/profiles/dkan/modules/dkan/dkan_sitewide/modules/facet_icons/facet_icons.info +++ b/profiles/dkan/modules/dkan/dkan_sitewide/modules/facet_icons/facet_icons.info @@ -6,4 +6,4 @@ dependencies[] = facetapi dependencies[] = panels_style_collapsible files[] = widget_term_icons.inc files[] = widget_content_type_icons.inc -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_topics/dkan_topics.info b/profiles/dkan/modules/dkan/dkan_topics/dkan_topics.info index 0f56683215e..987295051b8 100755 --- a/profiles/dkan/modules/dkan/dkan_topics/dkan_topics.info +++ b/profiles/dkan/modules/dkan/dkan_topics/dkan_topics.info @@ -57,4 +57,4 @@ features_exclude[dependencies][dkan_dataset_groups] = dkan_dataset_groups features_exclude[dependencies][dkan_topics] = dkan_topics no autodetect = 1 project path = profiles/dkan/modules/dkan -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_topics/modules/dkan_default_topics/dkan_default_topics.info b/profiles/dkan/modules/dkan/dkan_topics/modules/dkan_default_topics/dkan_default_topics.info index 889e68c20d6..3ecdc350992 100755 --- a/profiles/dkan/modules/dkan/dkan_topics/modules/dkan_default_topics/dkan_default_topics.info +++ b/profiles/dkan/modules/dkan/dkan_topics/modules/dkan_default_topics/dkan_default_topics.info @@ -5,4 +5,4 @@ package = DKAN Features dependencies[] = dkan_topics dependencies[] = taxonomy_fixtures dependencies[] = taxonomy -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_workflow/dkan_workflow.info b/profiles/dkan/modules/dkan/dkan_workflow/dkan_workflow.info index 0cbc6cddab1..77b5291eab2 100644 --- a/profiles/dkan/modules/dkan/dkan_workflow/dkan_workflow.info +++ b/profiles/dkan/modules/dkan/dkan_workflow/dkan_workflow.info @@ -33,4 +33,4 @@ features[workbench_moderation_transitions][] = needs_review:published features[workbench_moderation_transitions][] = published:needs_review features_exclude[dependencies][ctools] = ctools features_exclude[dependencies][dkan_dataset_content_types] = dkan_dataset_content_types -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_workflow/modules/dkan_workflow_permissions/dkan_workflow_permissions.info b/profiles/dkan/modules/dkan/dkan_workflow/modules/dkan_workflow_permissions/dkan_workflow_permissions.info index 208dc197790..51e13c9113d 100644 --- a/profiles/dkan/modules/dkan/dkan_workflow/modules/dkan_workflow_permissions/dkan_workflow_permissions.info +++ b/profiles/dkan/modules/dkan/dkan_workflow/modules/dkan_workflow_permissions/dkan_workflow_permissions.info @@ -9,4 +9,4 @@ features[roles_permissions][] = Workflow Contributor features[roles_permissions][] = Workflow Moderator features[roles_permissions][] = Workflow Supervisor project path = profiles/dkan/modules/dkan/dkan_workflow/modules -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/dkan_workflow/modules/views_dkan_workflow_tree/views_dkan_workflow_tree.info b/profiles/dkan/modules/dkan/dkan_workflow/modules/views_dkan_workflow_tree/views_dkan_workflow_tree.info index 2fe20f8e7a7..0f6a78cfbb1 100644 --- a/profiles/dkan/modules/dkan/dkan_workflow/modules/views_dkan_workflow_tree/views_dkan_workflow_tree.info +++ b/profiles/dkan/modules/dkan/dkan_workflow/modules/views_dkan_workflow_tree/views_dkan_workflow_tree.info @@ -6,4 +6,4 @@ dependencies[] = views dependencies[] = workbench_moderation files[] = ViewsDkanWorkflowTreePluginStyle.inc stylesheets[all][] = views_dkan_workflow_tree.css -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/open_data_federal_extras/open_data_federal_extras.info b/profiles/dkan/modules/dkan/open_data_federal_extras/open_data_federal_extras.info index 8cc891be68d..7f98b67bfd6 100644 --- a/profiles/dkan/modules/dkan/open_data_federal_extras/open_data_federal_extras.info +++ b/profiles/dkan/modules/dkan/open_data_federal_extras/open_data_federal_extras.info @@ -27,4 +27,4 @@ features[field_instance][] = node-dataset-field_odfe_data_quality features[field_instance][] = node-dataset-field_odfe_investment_uii features[field_instance][] = node-dataset-field_odfe_program_code features[field_instance][] = node-dataset-field_odfe_system_of_records -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/modules/dkan/open_data_schema_map_dkan/open_data_schema_map_dkan.info b/profiles/dkan/modules/dkan/open_data_schema_map_dkan/open_data_schema_map_dkan.info index 0d3fee5b84f..e2cca58d199 100644 --- a/profiles/dkan/modules/dkan/open_data_schema_map_dkan/open_data_schema_map_dkan.info +++ b/profiles/dkan/modules/dkan/open_data_schema_map_dkan/open_data_schema_map_dkan.info @@ -21,4 +21,4 @@ features[open_data_schema_apis][] = data_json_1_1 features[open_data_schema_apis][] = dcat_ap_v1_1_dataset features[open_data_schema_apis][] = dcat_v1_1 features[open_data_schema_apis][] = dcat_v1_1_json -version = 7.x-1.18.11 +version = 7.x-1.18.12 diff --git a/profiles/dkan/test/features/search.feature b/profiles/dkan/test/features/search.feature index 0cbb71f9df7..9ed52f0f71b 100644 --- a/profiles/dkan/test/features/search.feature +++ b/profiles/dkan/test/features/search.feature @@ -8,7 +8,7 @@ Feature: Search And pages: | name | url | | Dataset Search | /search/type/dataset | - | Dataset Results | /search?query=Dataset%2001 | + | Dataset Results | /search?query=DKANTest | | Topics Search | /search/field_topics | | Topics Redirect | /topics | | Not valid type search | /search/type/notvalid | @@ -51,9 +51,9 @@ Feature: Search @search_01 Scenario: Searching datasets Given I am on the "Dataset Search" page - When I search for "Dataset 01" + When I search for "DKANTest" Then I should be on the "Dataset Results" page - And I should see "Dataset 01" + And I should see "DKANTest" @search_02 Scenario: See number of datasets on search page and Reset dataset search filters