diff --git a/composer.json b/composer.json
index 38a8e7ea44..f819787225 100644
--- a/composer.json
+++ b/composer.json
@@ -57,7 +57,7 @@
"drupal/search_api": "1.13",
"drupal/search_api_solr": "2.2",
"drupal/simplenews": "^1.0-beta1",
- "drupal/smart_trim": "^1.0",
+ "drupal/smart_trim": "~1.2",
"drupal/social_media_links": "^2.6",
"drupal/spdx": "^1.0.0-alpha5",
"drupal/state_machine": "^1.0-rc1",
@@ -253,9 +253,6 @@
"Views cached results are not taking into account the access check. @see https://www.drupal.org/node/2824640": "resources/patch/search-api-2824640-103-8.x-1.13.patch",
"item_id column is too short. @see https://www.drupal.org/node/2829696": "https://www.drupal.org/files/issues/item_id_column_is_too_short-2829696-10-D8.patch"
},
- "drupal/smart_trim": {
- "Additional options checkbox do not appear to save @see https://www.drupal.org/project/smart_trim/issues/2941492": "https://www.drupal.org/files/issues/2018-05-04/2941492-4.patch"
- },
"drupal/social_media_links": {
"Missing config schema for field, widget and formatter @see https://www.drupal.org/node/2898680": "https://www.drupal.org/files/issues/2898680-6.patch",
"Plugins with URL prefix should not allow URLs as user input @see https://www.drupal.org/node/2898726": "https://www.drupal.org/files/issues/2898726-3.patch"
diff --git a/composer.lock b/composer.lock
index a24393c797..b94520609d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "dfaac7ca60cd7c149322059aceece1e4",
+ "content-hash": "eb94660d4a6b3d8596682029e489fefe",
"packages": [
{
"name": "SEMICeu/adms-ap_validator",
@@ -3796,7 +3796,7 @@
},
"drupal": {
"version": "8.x-2.0-alpha10",
- "datestamp": "1573073887",
+ "datestamp": "1575458288",
"security-coverage": {
"status": "not-covered",
"message": "Alpha releases are not covered by Drupal security advisories."
@@ -4404,7 +4404,7 @@
},
"drupal": {
"version": "8.x-3.0-beta2",
- "datestamp": "1572536587",
+ "datestamp": "1575970981",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
@@ -4496,7 +4496,7 @@
},
"drupal": {
"version": "8.x-1.6",
- "datestamp": "1569408784",
+ "datestamp": "1575405480",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -5396,7 +5396,7 @@
},
"drupal": {
"version": "8.x-1.5",
- "datestamp": "1570828084",
+ "datestamp": "1575467285",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -6156,17 +6156,17 @@
},
{
"name": "drupal/smart_trim",
- "version": "1.1.0",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/smart_trim.git",
- "reference": "8.x-1.1"
+ "reference": "8.x-1.2"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/smart_trim-8.x-1.1.zip",
- "reference": "8.x-1.1",
- "shasum": "5f1c0f15914208e0ad2ec5cce1d6419040596fc0"
+ "url": "https://ftp.drupal.org/files/projects/smart_trim-8.x-1.2.zip",
+ "reference": "8.x-1.2",
+ "shasum": "4f23b41cc5e09231640d53f0c405f999b81f17b9"
},
"require": {
"drupal/core": "*"
@@ -6177,15 +6177,12 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.1",
- "datestamp": "1516301286",
+ "version": "8.x-1.2",
+ "datestamp": "1576094525",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
- },
- "patches_applied": {
- "Additional options checkbox do not appear to save @see https://www.drupal.org/project/smart_trim/issues/2941492": "https://www.drupal.org/files/issues/2018-05-04/2941492-4.patch"
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
@@ -9837,7 +9834,7 @@
"reference": "master"
},
"type": "library",
- "time": "2019-03-13T23:53:42+00:00"
+ "time": "2019-03-22T22:25:24+00:00"
},
{
"name": "stack/builder",
diff --git a/tests/features/collection/collection.about.feature b/tests/features/collection/collection.about.feature
index 7783a64dd0..8a66f2a8eb 100644
--- a/tests/features/collection/collection.about.feature
+++ b/tests/features/collection/collection.about.feature
@@ -54,7 +54,7 @@ Feature: About page
And I press "Publish"
Then I should see the heading "Fitness at work"
And the page should contain the html text "This collection is intended to show ways of being fit while working"
- And I should see the text "In consequat sapien risus a…"
+ And I should see the text "In consequat sapien risus a malesuada…"
But I should not see the text "malesuada eros auctor eget. Curabitur at"
When I click "Read more" in the "Content" region
Then I should see the heading "About Fitness at work"
diff --git a/tests/features/collection/collection_content.feature b/tests/features/collection/collection_content.feature
index 96705322af..8c42e48059 100644
--- a/tests/features/collection/collection_content.feature
+++ b/tests/features/collection/collection_content.feature
@@ -132,7 +132,7 @@ Feature: Collection content
# Check the discussion tile.
Then I should see the "Bigger than Egyptian Museum of Cairo?" tile
# Check into the HTML so that we assert that actually the HTML has been stripped.
- And the page should contain the html text "Link to the museum web site ."
+ And the page should contain the html text "Link to the museum website."
And I should not see the link "Link to the museum"
# Check the document tile.
And I should see the "Upper Floor Map" tile
@@ -142,5 +142,5 @@ Feature: Collection content
And I should see the "Turin Egyptian Museum Reopened" tile
# Check the newsletter tile.
And I should see the "Stay informed about this year events and exhibitions" tile
- And the page should contain the html text "Subscribe to the newsletter to stay up-to-date! ."
+ And the page should contain the html text "Subscribe to the newsletter to stay up-to-date!."
And I should not see the link "Subscribe to the newsletter"
diff --git a/tests/features/joinup_rss/collection_feed.feature b/tests/features/joinup_rss/collection_feed.feature
index 9f0955551b..ec00108b92 100644
--- a/tests/features/joinup_rss/collection_feed.feature
+++ b/tests/features/joinup_rss/collection_feed.feature
@@ -57,14 +57,14 @@ Feature: Collection RSS feed.
| link | /collection/indigo-monkey/feed.xml |
And the RSS feed should have 7 items
And the RSS feed items should be:
- | title | link | description | publication date | author |
- | Discussion: Is the indigo coloration caused by their food? | /collection/indigo-monkey/discussion/indigo-coloration-caused-their-food | I was reading the technical paper and it seems their main food is the indigo cherries. | Mon, 21 Jan 2019 13:00:00 +0100 | Aleta Jakeman |
- | News: Monkeys favourite indigo amongst colors | /collection/indigo-monkey/news/monkeys-favourite-indigo-amongst-colors | Research results are out. | Mon, 21 Jan 2019 12:36:00 +0100 | Aleta Jakeman |
- | Solution: Proton Lonesome | /solution/proton-lonesome | | Sat, 05 Jan 2019 10:00:00 +0100 | Aleta Jakeman |
- | Solution: Lantern Global | /solution/lantern-global | | Tue, 18 Dec 2018 08:00:00 +0100 | Aleta Jakeman |
- | Event: Banana tasting | /collection/indigo-monkey/event/banana-tasting | Testing more than 20 varities of bananas from all over the world. | Fri, 14 Sep 2018 07:36:00 +0200 | Forest Robinson |
- | Custom page: Indigo variations | /collection/indigo-monkey/indigo-variations | The four major tones of indigo are listed here. | Sun, 15 Oct 2017 18:30:00 +0200 | Forest Robinson |
- | Document: Indigo technical paper | /collection/indigo-monkey/document/indigo-technical-paper | All technical information about the rare indigo monkeys. | Mon, 30 May 2016 12:21:00 +0200 | Aleta Jakeman |
+ | title | link | description | publication date | author |
+ | Discussion: Is the indigo coloration caused by their food? | /collection/indigo-monkey/discussion/indigo-coloration-caused-their-food | I was reading the technical paper and it seems their main food is the indigo cherries.
| Mon, 21 Jan 2019 13:00:00 +0100 | Aleta Jakeman |
+ | News: Monkeys favourite indigo amongst colors | /collection/indigo-monkey/news/monkeys-favourite-indigo-amongst-colors | Research results are out.
| Mon, 21 Jan 2019 12:36:00 +0100 | Aleta Jakeman |
+ | Solution: Proton Lonesome | /solution/proton-lonesome | | Sat, 05 Jan 2019 10:00:00 +0100 | Aleta Jakeman |
+ | Solution: Lantern Global | /solution/lantern-global | | Tue, 18 Dec 2018 08:00:00 +0100 | Aleta Jakeman |
+ | Event: Banana tasting | /collection/indigo-monkey/event/banana-tasting | Testing more than 20 varities of bananas from all over the world.
| Fri, 14 Sep 2018 07:36:00 +0200 | Forest Robinson |
+ | Custom page: Indigo variations | /collection/indigo-monkey/indigo-variations | The four major tones of indigo are listed here.
| Sun, 15 Oct 2017 18:30:00 +0200 | Forest Robinson |
+ | Document: Indigo technical paper | /collection/indigo-monkey/document/indigo-technical-paper | All technical information about the rare indigo monkeys.
| Mon, 30 May 2016 12:21:00 +0200 | Aleta Jakeman |
When I go to the homepage of the "Dreaded Scissors" collection
Then the page should contain an RSS autodiscovery link with title "Latest updates from the Dreaded Scissors collection" pointing to "/collection/dreaded-scissors/feed.xml"
@@ -76,10 +76,15 @@ Feature: Collection RSS feed.
| description | This feed contains the latest published content from the Dreaded Scissors collection, including the newest solutions. |
| link | /collection/dreaded-scissors/feed.xml |
And the RSS feed items should be:
- | title | link | description | publication date | author |
- | Solution: Shiny Ray | /solution/shiny-ray | | Tue, 14 Aug 2018 17:36:00 +0200 | Otto Drake |
- | News: New metal alloy improves scissors | /collection/dreaded-scissors/news/new-metal-alloy-improves-scissors | It improves sharpness but they are more subject to rust. | Wed, 11 Apr 2018 09:00:00 +0200 | Otto Drake |
- | Event: Scissor sharpening party | /collection/dreaded-scissors/event/scissor-sharpening-party | The place where to be if you want to keep cutting the paper at the best of your scissors possibilities . Lorem ipsum dolor sit amet consectetur adipiscing elit. Etiam sed consectetur turpis. In porta | Sun, 26 Nov 2017 14:18:00 +0100 | Otto Drake |
+ | title | link | description | publication date | author |
+ | Solution: Shiny Ray | /solution/shiny-ray | | Tue, 14 Aug 2018 17:36:00 +0200 | Otto Drake |
+ | News: New metal alloy improves scissors | /collection/dreaded-scissors/news/new-metal-alloy-improves-scissors | It improves sharpness but they are more subject to rust.
| Wed, 11 Apr 2018 09:00:00 +0200 | Otto Drake |
+ # The 'Scissor sharpening party' is using the `content_editor` text format
+ # which is not configured to wrap the result in tags after stripping
+ # the HTML from it. This is different from the other tests that use the
+ # `plain_text` text format. In production all content will be using this
+ # text format since all text is entered through the content editor.
+ | Event: Scissor sharpening party | /collection/dreaded-scissors/event/scissor-sharpening-party | The place where to be if you want to keep cutting the paper at the best of your scissors possibilities. Lorem ipsum dolor sit amet consectetur adipiscing elit. Etiam sed consectetur turpis. In porta | Sun, 26 Nov 2017 14:18:00 +0100 | Otto Drake |
When I go to the homepage of the "Lantern Global" solution
Then I should not see the link "RSS feed" in the "Entity actions" region
diff --git a/web/modules/custom/joinup_licence/js/licence_filter.js b/web/modules/custom/joinup_licence/js/licence_filter.js
index 42e5d79137..56b04340ca 100644
--- a/web/modules/custom/joinup_licence/js/licence_filter.js
+++ b/web/modules/custom/joinup_licence/js/licence_filter.js
@@ -14,7 +14,7 @@
});
// Check every active filter item
- // and hide tiles which don't contain proper data-licence-category
+ // and hide tiles which don't contain proper data-licence-category.
$('.licence-filter__item a.is-active').each(function () {
var currentlicenceCategory = $(this).attr('data-licence-category');
if (typeof currentlicenceCategory !== 'undefined') {
@@ -31,7 +31,7 @@
});
// Check licence search field value
- // and hide tiles which don't contain proper data-spdx
+ // and hide tiles which don't contain proper data-spdx.
var licenceTiles = 0;
var currentSpdxId = $('#licence-search').val().toLowerCase();
$licenceTile.each(function () {
@@ -48,7 +48,7 @@
}
});
- // Show calculated number of tiles
+ // Show calculated number of tiles.
$('.licence-counter__number').text(licenceTiles);
}
@@ -129,7 +129,7 @@
checkLicenceCategories();
});
- // Reset licence listing
+ // Reset licence listing.
$('#licence-reset').on('click', function (event) {
$('.licence-filter__item a.is-active').removeClass('is-active');
$('.licence-search__input input').val('');
@@ -165,7 +165,7 @@
else {
if (licencesArray.length > 0) {
licencesArray = JSON.parse(licences);
- licencesArray = licencesArray.filter(function(value){
+ licencesArray = licencesArray.filter(function (value) {
return value !== licenceName;
});
licencesString = JSON.stringify(licencesArray);
@@ -197,7 +197,7 @@
// Filter on window load
// Needed for licence search filter.
- $(window).on('load', function() {
+ $(window).on('load', function () {
checkLicenceCategories();
checkCompareStatus();
});
diff --git a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiField.php b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiField.php
index 1faa51c4b0..e93eb39397 100644
--- a/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiField.php
+++ b/web/modules/custom/search_api_field/src/Plugin/facets/facet_source/SearchApiField.php
@@ -105,13 +105,14 @@ public function fillFacetsWithResults(array $facets) {
if (!$results) {
/* @var $search_api_index \Drupal\search_api\IndexInterface */
$search_api_index = $this->getIndex();
+ $current_request = $this->requestStack->getCurrentRequest();
// Create the query.
$options = [
'parse_mode' => 'direct',
// @Todo Fix limit, get it from field settings.
'limit' => 10,
- 'offset' => isset($_GET['page']) ? $_GET['page'] : 0,
+ 'offset' => $current_request->get('page', 0),
];
$query = $search_api_index->query($options);
$query->setSearchId($plugin_definition_id);
diff --git a/web/themes/joinup/js/cookie-extend.js b/web/themes/joinup/js/cookie-extend.js
index 60f75c4af6..f66a32ed76 100644
--- a/web/themes/joinup/js/cookie-extend.js
+++ b/web/themes/joinup/js/cookie-extend.js
@@ -5,9 +5,9 @@
(function ($) {
// Add custom class if page has cookie banner.
- $(window).bind("load", function() {
+ $(window).bind("load", function () {
if (window.bannerDisplayed) {
$('body').addClass('has-cookie-consent-banner');
}
});
-})(jQuery);
\ No newline at end of file
+})(jQuery);