Upgrade dkan to 1.15.5 (#515)

GetDKAN · Oct 24, 2018 · a91b5e1 · a91b5e1
1 parent 19cf8d4
commit a91b5e1
Show file tree

Hide file tree

Showing 18 changed files with 163 additions and 375 deletions.
diff --git a/build-dkan.make b/build-dkan.make
@@ -8,4 +8,4 @@ projects:
     download:
       type: git
       url: https://github.com/GetDKAN/dkan.git
-      tag: 7.x-1.15.4
+      tag: 7.x-1.15.5
diff --git a/dkan/dkan.info b/dkan/dkan.info
@@ -125,4 +125,4 @@ dependencies[] = dkan_datastore
 dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
-version = 7.x-1.15.4
+version = 7.x-1.15.5
diff --git a/dkan/dkan.install b/dkan/dkan.install
@@ -467,3 +467,14 @@ function dkan_update_7027() {
   }
   drupal_set_message(t('Removed harvest date values from @var non-harvested datasets.', array('@var' => $count)), 'status');
 }
+
+/**
+ * Remove deprecated stories view.
+ */
+function dkan_update_7028() {
+  // Check that the view exists.
+  if ($view = views_get_view('stories')) {
+    // Delete the view.
+    views_delete_view($view);
+  }
+}
diff --git a/dkan/drupal-org.make b/dkan/drupal-org.make
@@ -92,8 +92,6 @@ projects:
     version: '2.9'
   facetapi:
     version: '1.5'
-    patch:
-      1: patches/cross-site-scripting-facets-156778.patch
   facetapi_bonus:
     version: '1.2'
   facetapi_pretty_paths:

diff --git a/dkan/modules/contrib/facetapi/PATCHES.txt b/dkan/modules/contrib/facetapi/PATCHES.txt
diff --git a/dkan/modules/contrib/facetapi/cross-site-scripting-facets-156778.patch b/dkan/modules/contrib/facetapi/cross-site-scripting-facets-156778.patch
diff --git a/dkan/modules/contrib/facetapi/plugins/facetapi/url_processor.inc b/dkan/modules/contrib/facetapi/plugins/facetapi/url_processor.inc
@@ -149,7 +149,6 @@ abstract class FacetapiUrlProcessor {
     if (!isset($this->params[$this->filterKey]) || !is_array($this->params[$this->filterKey])) {
       $this->params[$this->filterKey] = array();
     }
-    $this->params[$this->filterKey] = array_map('filter_xss', $this->params[$filter_key]);
     return $this;
   }
 

diff --git a/dkan/modules/dkan/dkan_data_story/css/dkan_data_story.css b/dkan/modules/dkan/dkan_data_story/css/dkan_data_story.css
@@ -42,18 +42,23 @@ Data Story Panels
 /***************************
 Data Story Page
 ***************************/
-.view-stories .view-header {
-  margin-bottom: 1em;
+.view-data-stories .view-content {
+  margin-left: -15px;
+  margin-right: -15px;
+}
+.view-data-stories .views-column-1,
+.view-data-stories .views-column-2 {
+  margin-bottom: 2em;
 }
-.view-stories .row img {
+.view-data-stories .row img {
   width: 100%;
   height: auto;
   margin-top: 1.5em;
 }
-.view-stories .views-field-field-tags {
+.view-data-stories .views-field-field-tags {
   margin: 1em 0 2em;
 }
-.view-stories .more-link {
+.view-data-stories .more-link {
   clear: both;
   display: block;
   font-weight: bold;

diff --git a/dkan/modules/dkan/dkan_data_story/dkan_data_story.features.field_instance.inc b/dkan/modules/dkan/dkan_data_story/dkan_data_story.features.field_instance.inc
@@ -24,6 +24,12 @@ function dkan_data_story_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 2,
       ),
+      'print' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'search_result' => array(
         'label' => 'hidden',
         'module' => 'text',
@@ -71,9 +77,16 @@ function dkan_data_story_field_default_field_instances() {
     'display' => array(
       'default' => array(
         'label' => 'hidden',
+        'settings' => array(),
         'type' => 'hidden',
         'weight' => 1,
       ),
+      'print' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'search_result' => array(
         'label' => 'above',
         'settings' => array(),
@@ -167,6 +180,12 @@ function dkan_data_story_field_default_field_instances() {
         'type' => 'hidden',
         'weight' => 3,
       ),
+      'print' => array(
+        'label' => 'above',
+        'settings' => array(),
+        'type' => 'hidden',
+        'weight' => 0,
+      ),
       'search_result' => array(
         'label' => 'above',
         'settings' => array(),

diff --git a/dkan/modules/dkan/dkan_data_story/dkan_data_story.features.inc b/dkan/modules/dkan/dkan_data_story/dkan_data_story.features.inc
@@ -83,170 +83,3 @@ function dkan_data_story_node_info() {
   drupal_alter('node_info', $items);
   return $items;
 }
-
-/**
- * Implements hook_default_search_api_index().
- */
-function dkan_data_story_default_search_api_index() {
-  $items = array();
-  $items['stories_index'] = entity_import('search_api_index', '{
-    "name" : "Stories Index",
-    "machine_name" : "stories_index",
-    "description" : null,
-    "server" : "stories_server",
-    "item_type" : "node",
-    "options" : {
-      "datasource" : { "bundles" : [ "dkan_data_story" ] },
-      "index_directly" : 1,
-      "cron_limit" : "50",
-      "fields" : {
-        "author" : { "type" : "integer", "entity_type" : "user" },
-        "changed" : { "type" : "date" },
-        "created" : { "type" : "date" },
-        "field_tags" : { "type" : "list\\u003Cinteger\\u003E", "entity_type" : "taxonomy_term" },
-        "search_api_access_node" : { "type" : "list\\u003Cstring\\u003E" },
-        "search_api_language" : { "type" : "string" },
-        "search_api_viewed" : { "type" : "text" },
-        "status" : { "type" : "boolean" },
-        "title" : { "type" : "string" },
-        "type" : { "type" : "string" }
-      },
-      "data_alter_callbacks" : {
-        "search_api_alter_node_access" : { "status" : 1, "weight" : "0", "settings" : [] },
-        "search_api_alter_node_status" : { "status" : 1, "weight" : "0", "settings" : [] },
-        "search_api_alter_add_hierarchy" : { "status" : 0, "weight" : "0", "settings" : { "fields" : [] } },
-        "search_api_alter_add_viewed_entity" : { "status" : 1, "weight" : "0", "settings" : { "mode" : "full" } },
-        "search_api_alter_add_aggregation" : { "status" : 0, "weight" : "0", "settings" : [] },
-        "search_api_alter_add_url" : { "status" : 0, "weight" : "0", "settings" : [] }
-      },
-      "processors" : {
-        "search_api_case_ignore" : { "status" : 0, "weight" : "0", "settings" : { "fields" : [] } },
-        "search_api_html_filter" : {
-          "status" : 1,
-          "weight" : "10",
-          "settings" : {
-            "fields" : [],
-            "title" : 0,
-            "alt" : 1,
-            "tags" : "h1 = 5\\r\\nh2 = 3\\r\\nh3 = 2\\r\\nstrong = 2\\r\\nb = 2\\r\\nem = 1.5\\r\\nu = 1.5"
-          }
-        },
-        "search_api_tokenizer" : {
-          "status" : 1,
-          "weight" : "20",
-          "settings" : {
-            "fields" : { "search_api_viewed" : true },
-            "spaces" : "[^[:alnum:]]",
-            "ignorable" : "[\\u0027]"
-          }
-        },
-        "search_api_stopwords" : {
-          "status" : 0,
-          "weight" : "30",
-          "settings" : {
-            "fields" : [],
-            "file" : "",
-            "stopwords" : "but\\r\\ndid\\r\\nthe this that those\\r\\netc"
-          }
-        },
-        "search_api_highlighting" : {
-          "status" : 0,
-          "weight" : "35",
-          "settings" : {
-            "prefix" : "\\u003Cstrong\\u003E",
-            "suffix" : "\\u003C\\/strong\\u003E",
-            "excerpt" : 1,
-            "excerpt_length" : "256",
-            "exclude_fields" : [],
-            "highlight" : "always"
-          }
-        }
-      }
-    },
-    "enabled" : "1",
-    "read_only" : "0"
-  }');
-  return $items;
-}
-
-/**
- * Implements hook_default_search_api_server().
- */
-function dkan_data_story_default_search_api_server() {
-  $items = array();
-  $items['stories_server'] = entity_import('search_api_server', '{
-    "name" : "Stories Server",
-    "machine_name" : "stories_server",
-    "description" : "",
-    "class" : "search_api_db_service",
-    "options" : {
-      "database" : "default:default",
-      "min_chars" : "2",
-      "partial_matches" : 0,
-      "indexes" : { "stories_index" : {
-          "type" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "type",
-            "type" : "string",
-            "boost" : "1.0"
-          },
-          "title" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "title",
-            "type" : "string",
-            "boost" : "1.0"
-          },
-          "status" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "status",
-            "type" : "boolean",
-            "boost" : "1.0"
-          },
-          "created" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "created",
-            "type" : "date",
-            "boost" : "1.0"
-          },
-          "changed" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "changed",
-            "type" : "date",
-            "boost" : "1.0"
-          },
-          "author" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "author",
-            "type" : "integer",
-            "boost" : "1.0"
-          },
-          "field_tags" : {
-            "table" : "search_api_db_stories_index_field_tags",
-            "column" : "value",
-            "type" : "list\\u003Cinteger\\u003E",
-            "boost" : "1.0"
-          },
-          "search_api_language" : {
-            "table" : "search_api_db_stories_index",
-            "column" : "search_api_language",
-            "type" : "string",
-            "boost" : "1.0"
-          },
-          "search_api_viewed" : {
-            "table" : "search_api_db_stories_index_text",
-            "type" : "text",
-            "boost" : "1.0"
-          },
-          "search_api_access_node" : {
-            "table" : "search_api_db_stories_index_search_api_access_node",
-            "column" : "value",
-            "type" : "list\\u003Cstring\\u003E",
-            "boost" : "1.0"
-          }
-        }
-      }
-    },
-    "enabled" : "1"
-  }');
-  return $items;
-}
diff --git a/dkan/modules/dkan/dkan_data_story/dkan_data_story.info b/dkan/modules/dkan/dkan_data_story/dkan_data_story.info
@@ -26,8 +26,6 @@ features[image][] = story_image_full
 features[image][] = story_image_teaser
 features[node][] = dkan_data_story
 features[panelizer_defaults][] = node:dkan_data_story:default:default
-features[search_api_index][] = stories_index
-features[search_api_server][] = stories_server
 features[variable][] = dkan_sitewide_panelizer_dkan_data_story
 features[variable][] = field_bundle_settings_node__dkan_data_story
 features[variable][] = menu_options_dkan_data_story
@@ -41,8 +39,8 @@ features[variable][] = panelizer_node:dkan_data_story_allowed_layouts_default
 features[variable][] = panelizer_node:dkan_data_story_allowed_types_default
 features[variable][] = panelizer_node:dkan_data_story_default
 features[variable][] = pathauto_node_dkan_data_story_pattern
+features[views_view][] = data_stories
 features[views_view][] = dkan_data_stories
-features[views_view][] = stories
 features_exclude[dependencies][autocomplete_deluxe] = autocomplete_deluxe
 features_exclude[dependencies][ctools] = ctools
 features_exclude[dependencies][dkan_dataset_content_types] = dkan_dataset_content_types