Merge pull request #408 from NuCivic/1.13.6.0

DKAN upgrade to 7.x-1.13.6
GetDKAN · Jul 28, 2017 · 0b6fd90 · 0b6fd90
2 parents 5a560c5 + f8de812
commit 0b6fd90
Show file tree

Hide file tree

Showing 111 changed files with 567 additions and 357 deletions.
diff --git a/ahoy/site/.cache/36/3674690d5e19e1d8d05b6039946e83542eb483bc7196a4097da1c7ddb6227dcc.php b/ahoy/site/.cache/36/3674690d5e19e1d8d05b6039946e83542eb483bc7196a4097da1c7ddb6227dcc.php
@@ -0,0 +1,58 @@
+<?php
+
+/* config.php.twig */
+class __TwigTemplate_828f08b45229f756082e9d8f8d5c2cad54c1ad1caac76416b248e7d033591e6a extends Twig_Template
+{
+    public function __construct(Twig_Environment $env)
+    {
+        parent::__construct($env);
+
+        $this->parent = false;
+
+        $this->blocks = array(
+        );
+    }
+
+    protected function doDisplay(array $context, array $blocks = array())
+    {
+        // line 1
+        echo "<?php
+/**
+ * @file
+ * Contents generated automatically by `ahoy site config` command.
+ * DO NOT EDIT.
+ */
+\$conf = ";
+        // line 7
+        echo twig_escape_filter($this->env, var_export((isset($context["config"]) ? $context["config"] : null)), "html", null, true);
+        echo ";";
+    }
+
+    public function getTemplateName()
+    {
+        return "config.php.twig";
+    }
+
+    public function isTraitable()
+    {
+        return false;
+    }
+
+    public function getDebugInfo()
+    {
+        return array (  27 => 7,  19 => 1,);
+    }
+
+    /** @deprecated since 1.27 (to be removed in 2.0). Use getSourceContext() instead */
+    public function getSource()
+    {
+        @trigger_error('The '.__METHOD__.' method is deprecated since version 1.27 and will be removed in 2.0. Use getSourceContext() instead.', E_USER_DEPRECATED);
+
+        return $this->getSourceContext()->getCode();
+    }
+
+    public function getSourceContext()
+    {
+        return new Twig_Source("", "config.php.twig", "/Users/msolv/Projects/nucivic/dkan_starter/.ahoy/site/.templates/config.php.twig");
+    }
+}
diff --git a/build-dkan.make b/build-dkan.make
@@ -8,7 +8,5 @@ includes[core] = dkan/drupal-org-core.make
 projects[dkan][type] = profile
 projects[dkan][download][type] = git
 projects[dkan][download][url] = https://github.com/NuCivic/dkan.git
-projects[dkan][download][tag] = 7.x-1.13.5
+projects[dkan][download][tag] = 7.x-1.13.6
 
-projects[dkan][patch][] = https://patch-diff.githubusercontent.com/raw/NuCivic/dkan/pull/2018.diff
-projects[dkan][patch][] = https://patch-diff.githubusercontent.com/raw/NuCivic/dkan/pull/2025.diff
diff --git a/config/config.php b/config/config.php
@@ -112,6 +112,9 @@
     ),
     'stage_file_proxy_origin' => 'changeme',
   ),
+  'dkan_dash' => 
+  array (
+  ),
   'gaClientTrackingCode' => 'UA-XXXXX-Y',
   'gaNuCivicTrackingCode' => 'UA-XXXXX-Z',
   'private' => 

diff --git a/config/config.yml b/config/config.yml
@@ -40,7 +40,6 @@ circle:
   - tests/features
   - dkan/test/features
   - config/tests/features
-dkan_dash: []
 default:
   clamav:
     enable: false
@@ -57,6 +56,7 @@ default:
     enable: false
   stage_file_proxy_files: []
   stage_file_proxy_origin: changeme
+dkan_dash: []
 gaClientTrackingCode: UA-XXXXX-Y
 gaNuCivicTrackingCode: UA-XXXXX-Z
 private:

diff --git a/dkan/CHANGELOG.txt b/dkan/CHANGELOG.txt
@@ -1,5 +1,15 @@
-7.x-1.13.5
-----------
+7.x-1.13.6 2017-07-28
+---------------------
+ - #2036 Add file_resup to the list of up to date projects.
+ - #2035 Change the 'Datasets' field on the Resource form to use autocomplete.
+ - #2034 Add language selectors to the 'chosen_jquery_selector' configuration.
+ - #2020 Module upgrades: fieldable_panels_panes, media, and search_api.
+ - #2018 Additional test/devops improvements needed for deployment. See #2012, #2014, #2015 and #2016 for specifics.
+ - #2025 Add configurable arguments via Behat Contexts.
+ - #2021 Add unique tags to more test scenarios.
+
+7.x-1.13.5 2017-07-14
+---------------------
  - #2003 Fix dkan_bueditor_markdown_install(), which was using a variable before it was initialized.
  - #2003 Fix to dkan_update_7016, which assumed the bueditor ID was always '5' and failed when it was not.
  - #2003 Fix dkan_topics_field_formatter_view(), which does not check if a term exists before calling it by tid.
@@ -8,10 +18,10 @@
  - #2003 Fix dkan_migrate_base warning: wrong type supplied to foreach.
  - #1963 Allow Behat dkanExtension to handle custom fields via devel generate
  - #1938 Allow skipping of features test via config
- - #1970 Automatically populate required fields when running behat tests.
+ - #1970 DevOps: Automatically populate required fields when running behat tests.
 
-7.x-1.13.4
-----------
+7.x-1.13.4 2017-06-30
+---------------------
  - #1983 Apply services security update 3.20 for DRUPAL-SA-CONTRIB-2017-054
  - #1877 Fix broken update that tries to migrate fields that may not exist (primarily due to Federal Extras upgrade)
  - #1960 Update field_group_table to 1.6
@@ -63,9 +73,6 @@
  - #1852 Allow the use of multi-polygonal data for Dataset Spatial field.
  - #1857 Fixed publishing options not accessible when dkan_workflow is enabled.
 
-7.x-1.13.3-RC1
---------------
- - #1810 Stop throwing exception on tables with only numeric columns, to prevent preview breaking.
 7.x-1.13.3 2017-04-18
 ---------------------
  - #1863 Update restws module to v2.7

diff --git a/dkan/PATCHES.txt b/dkan/PATCHES.txt
diff --git a/dkan/dkan.info b/dkan/dkan.info
@@ -125,6 +125,6 @@ dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
 
-; Information added by DKAN release script on 7/14/2017
-version = 7.x-1.13.5
+; Information added by DKAN release script on 7/28/2017
+version = 7.x-1.13.6
 project = dkan
diff --git a/dkan/dkan.install b/dkan/dkan.install
@@ -378,3 +378,12 @@ function dkan_update_7021() {
     ->condition('eid', $eid)
     ->execute();
 }
+
+/**
+ * Update chosen_jquery_selector to include language selectors.
+ */
+function dkan_update_7022() {
+  // REF #1936, #1890.
+  variable_set('chosen_jquery_selector',
+    '.page-node select:not([class*="delta-order"], [name*="workbench_moderation"], [class*="filter-list"], [id*="delimiter"],[name*="sort_by"],[name*="sort_order"], [id*="lines-terminated-by"], [id*="lang-dropdown-select-language"])');
+}
diff --git a/dkan/docs/releases/notes/1.13.6.md b/dkan/docs/releases/notes/1.13.6.md
@@ -0,0 +1,16 @@
+# DKAN 1.13.6
+
+This is a "patch" release of DKAN, containing bug fixes and minor
+updates, but adding no new functionality.
+
+## Improvements in this release
+
+- Add file_resup to the list of up to date projects ([#2036](https://github.com/NuCivic/dkan/pull/2036))
+- Change the 'Datasets' field on the Resource form to use autocomplete ([#2035](https://github.com/NuCivic/dkan/pull/2035))
+- Include language selectors in the 'chosen_jquery_selector' config ([#2034](https://github.com/NuCivic/dkan/pull/2034))
+- Module upgrades: fieldable_panels_panes, media, and search_api ([#2020](https://github.com/NuCivic/dkan/pull/2020))
+
+**Testing Improvements**
+- Additional test/devops improvements needed for deployment. See ([#2012](https://github.com/NuCivic/dkan/pull/2012), [#2014](https://github.com/NuCivic/dkan/pull/2014), [#2015](https://github.com/NuCivic/dkan/pull/2015), [#2016](https://github.com/NuCivic/dkan/pull/2016), [#2018](https://github.com/NuCivic/dkan/pull/2018)) for specifics.
+- Add configurable arguments via Behat Contexts. ([#2025](https://github.com/NuCivic/dkan/pull/2025))
+- Add unique tags to more test scenarios ([#2021](https://github.com/NuCivic/dkan/pull/2021))
diff --git a/dkan/docs/releases/notes/index.rst b/dkan/docs/releases/notes/index.rst
@@ -7,7 +7,9 @@ Release notes here will be identical to the releases kept in the `Github reposit
 .. toctree::
    :maxdepth: 1
 
-   1.13.4 (Future release) <1.13.4>
+   1.13.6 <1.13.6>
+   1.13.5 <1.13.5>
+   1.13.4 <1.13.4>
    1.13.3 <1.13.3>
    1.13.2 <1.13.2>
    1.13.1 <1.13.1>

diff --git a/dkan/drupal-org.make b/dkan/drupal-org.make
@@ -3,9 +3,9 @@ api: '2'
 core: 7.x
 includes:
 - https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.2/visualization_entity.make
-- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13.5/open_data_schema_map.make
+- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13.6/open_data_schema_map.make
 - https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/5a5f8faf664aeca02371f6692307580d9fab9116/leaflet_widget.make
-- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13.5/recline.make
+- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13.6/recline.make
 projects:
   admin_menu:
     version: 3.0-rc5
@@ -135,7 +135,7 @@ projects:
       2826182: https://www.drupal.org/files/issues/fieldable_panels_panes-title-shown-when-set-to-hidden-2826182-3.patch
       2826205: https://www.drupal.org/files/issues/fieldable_panels_panes-n2826205-32.patch
   file_entity:
-    version: 2.2
+    version: 2.3
   file_resup:
     download:
       type: git
@@ -202,7 +202,7 @@ projects:
     patch:
       2045225: http://drupal.org/files/remove-dsm-from-hook-install-2045225-1.patch
   media:
-    version: 2.8
+    version: 2.9
     patch:
       2272567: https://www.drupal.org/files/issues/media_dialog_appears_2272567-32.patch
   media_youtube:
@@ -246,7 +246,7 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/open_data_schema_map.git
-      tag: 7.x-1.13.5
+      tag: 7.x-1.13.6
   panelizer:
     version: '3.4'
   panels:
@@ -276,7 +276,7 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/recline.git
-      tag: 7.x-1.13.5
+      tag: 7.x-1.13.6
   ref_field:
     download:
       type: git
@@ -310,7 +310,7 @@ projects:
     version: '1.2'
     revision: 08b02458694d186f8ab3bd0b24fbc738f9271108
   search_api:
-    version: '1.21'
+    version: '1.22'
   search_api_db:
     version: '1.6'
   select_or_other:
@@ -407,4 +407,4 @@ libraries:
     directory_name: spyc
 defaults:
   projects:
-    subdir: contrib
+    subdir: contrib
diff --git a/dkan/modules/contrib/admin_menu_source/PATCHES.txt b/dkan/modules/contrib/admin_menu_source/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/allow_ordering_of_the-2441283-5.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/autocomplete_deluxe/PATCHES.txt b/dkan/modules/contrib/autocomplete_deluxe/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/autocomplete-deluxe-2833824-4.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/beautytips/PATCHES.txt b/dkan/modules/contrib/beautytips/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - http://drupal.org/files/include-excanvas-via-libraries-api-d7-849232-13.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/chosen/PATCHES.txt b/dkan/modules/contrib/chosen/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/chosen-accesibility_problem_with_input-0.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/color_field/PATCHES.txt b/dkan/modules/contrib/color_field/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/color_field-requirements-2696505-v2.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/colorizer/PATCHES.txt b/dkan/modules/contrib/colorizer/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/colorizer-add-rgb-vars-2227651-4b.patch
 - https://www.drupal.org/files/issues/colorizer-bug_system_cron_delete_current_css-2599298-9.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/entity/PATCHES.txt b/dkan/modules/contrib/entity/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/entity-multivalue-token-replacement-fix-2341611-0.patch
 - https://www.drupal.org/files/issues/Use-array-in-foreach-statement-2564119-1.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/entity_path/PATCHES.txt b/dkan/modules/contrib/entity_path/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/entity-path-mysql-5-7_3.diff
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/facetapi/PATCHES.txt b/dkan/modules/contrib/facetapi/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - cross-site-scripting-facets-156778.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/feeds/PATCHES.txt b/dkan/modules/contrib/feeds/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/1127696-137.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/feeds_field_fetcher/PATCHES.txt b/dkan/modules/contrib/feeds_field_fetcher/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
 - http://www.drupal.org/files/issues/feeds_field_fetcher-typo-error-2315425-1.patch
 - http://www.drupal.org/files/issues/feeds_field_fetcher_error-validation-config.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/field_group/PATCHES.txt b/dkan/modules/contrib/field_group/PATCHES.txt
@@ -2,4 +2,4 @@ The following patches have been applied to this project:
 - http://drupal.org/files/issues/field-group-show-ajax-2042681-8.patch
 - https://www.drupal.org/files/issues/hash-location-sanitization.diff
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/field_group_table/PATCHES.txt b/dkan/modules/contrib/field_group_table/PATCHES.txt
@@ -1,4 +1,4 @@
 The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/added_missing_isset_calls-2887897-2.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/fieldable_panels_panes/PATCHES.txt b/dkan/modules/contrib/fieldable_panels_panes/PATCHES.txt
@@ -3,4 +3,4 @@ The following patches have been applied to this project:
 - https://www.drupal.org/files/issues/fieldable_panels_panes-title-shown-when-set-to-hidden-2826182-3.patch
 - https://www.drupal.org/files/issues/fieldable_panels_panes-n2826205-32.patch
 
-This file was automatically generated by Drush Make (http://drupal.org/project/drush).
+This file was automatically generated by Drush Make (http://drupal.org/project/drush).
diff --git a/dkan/modules/contrib/file_entity/file_entity.field.inc b/dkan/modules/contrib/file_entity/file_entity.field.inc
@@ -272,6 +272,18 @@ function file_entity_field_formatter_settings_summary($field, $instance, $view_m
   return implode('<br />', $summary);
 }
 
+/**
+ * Implements hook_field_formatter_prepare_view().
+ */
+function file_entity_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
+  // File and image fields set item values to NULL if a file cannot be loaded.
+  // Remove those empty items so we can simply iterate through $items normally
+  // in file_entity_field_formatter_view().
+  foreach (array_keys($entities) as $id) {
+    $items[$id] = array_filter($items[$id]);
+  }
+}
+
 /**
  * Implements hook_field_formatter_view().
  */
@@ -356,9 +368,6 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
     case 'file_audio':
       $multiple_file_behavior = $settings['multiple_file_behavior'];
 
-      // Prevent 'empty' fields from causing a WSOD.
-      $items = array_filter($items);
-
       // Build an array of sources for each <audio> element.
       $source_lists = array();
       if ($multiple_file_behavior == 'tags') {
@@ -392,9 +401,6 @@ function file_entity_field_formatter_view($entity_type, $entity, $field, $instan
     case 'file_video':
       $multiple_file_behavior = $settings['multiple_file_behavior'];
 
-      // Prevent 'empty' fields from causing a WSOD.
-      $items = array_filter($items);
-
       // Build an array of sources for each <video> element.
       $source_lists = array();
       if ($multiple_file_behavior == 'tags') {