Skip to content

Commit

Permalink
1604080357: Proposed release for 7.x-1.18.12 (#111)
Browse files Browse the repository at this point in the history
  • Loading branch information
nucivicmachine authored Oct 30, 2020
1 parent 9acee09 commit 3ae813e
Show file tree
Hide file tree
Showing 47 changed files with 146 additions and 47 deletions.
5 changes: 5 additions & 0 deletions profiles/dkan/CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion profiles/dkan/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand Down
2 changes: 1 addition & 1 deletion profiles/dkan/dkan.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion profiles/dkan/modules/dkan/dkan_harvest/dkan_harvest.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion profiles/dkan/modules/dkan/dkan_ipe/dkan_ipe.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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' => '<p class="alert alert-warning">' . t('There is nothing to reset, no resource has been imported.') . '</p>',
];
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' => '<p class="alert alert-warning">' . t('No manifest was found.') . '</p>',
];
}
}
else {
$form['state'] = [
'#markup' => '<p class="alert alert-warning">' . t('Periodic updates are disabled.') . '</p>',
];
}

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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion profiles/dkan/modules/dkan/dkan_plugins/dkan_plugins.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion profiles/dkan/modules/dkan/dkan_topics/dkan_topics.info
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading

0 comments on commit 3ae813e

Please sign in to comment.