Skip to content

Commit f93a835

Browse files
dafederdafeder
authored
Merge pull request #60 from NuCivic/proposed_release_for_tag_1503498339
1503498339: Proposed release for 7.x-1.13.7
2 parents 0bf96f1 + 37ce77f commit f93a835

File tree

84 files changed

+677
-3116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+677
-3116
lines changed

‎profiles/dkan/CHANGELOG.txt

+7
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
7.x-1.13.7 2017-08-22
2+
---------------------
3+
- #2064 Update entityreference to 1.15
4+
- #2061 Update views to 3.17
5+
- #2060 Update tests to adjust to client customizations.
6+
- #2060 Removed unused modules menu_token and remote_file_source from drupal-org.make
7+
18
7.x-1.13.6 2017-07-28
29
---------------------
310
- #2036 Add file_resup to the list of up to date projects.

‎profiles/dkan/dkan.info

+2-2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,6 @@ dependencies[] = dkan_datastore_api
125125
dependencies[] = open_data_schema_map_dkan
126126
dependencies[] = visualization_entity_charts_dkan
127127

128-
; Information added by DKAN release script on 7/28/2017
129-
version = 7.x-1.13.6
128+
; Information added by DKAN release script on 8/23/2017
129+
version = 7.x-1.13.7
130130
project = dkan

‎profiles/dkan/docs/releases/notes/1.13.7.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# DKAN 1.13.7
2+
3+
This is a "patch" release of DKAN, containing bug fixes and minor
4+
updates, but adding no new functionality.
5+
6+
## Improvements in this release
7+
8+
- Important security updates to 'views' and 'entityreference' modules.
9+
- Multiple testing improvements.

‎profiles/dkan/drupal-org.make

+7-13
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ api: '2'
33
core: 7.x
44
includes:
55
- https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.2/visualization_entity.make
6-
- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13.6/open_data_schema_map.make
6+
- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/1.13.6/open_data_schema_map.make
77
- https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/5a5f8faf664aeca02371f6692307580d9fab9116/leaflet_widget.make
8-
- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13.6/recline.make
8+
- https://raw.githubusercontent.com/NuCivic/recline/1.13.6/recline.make
99
projects:
1010
admin_menu:
1111
version: 3.0-rc5
@@ -77,7 +77,7 @@ projects:
7777
patch:
7878
2809655: https://www.drupal.org/files/issues/entity-path-mysql-5-7_3.diff
7979
entityreference:
80-
version: '1.4'
80+
version: '1.5'
8181
entityreference_filter:
8282
version: '1.7'
8383
facetapi:
@@ -217,8 +217,6 @@ projects:
217217
version: '1.3'
218218
menu_block:
219219
version: '2.7'
220-
menu_token:
221-
version: 1.0-beta7
222220
migrate:
223221
version: '2.8'
224222
patch:
@@ -246,7 +244,7 @@ projects:
246244
download:
247245
type: git
248246
url: https://github.com/NuCivic/open_data_schema_map.git
249-
tag: 7.x-1.13.6
247+
tag: 7.x-1.13.7
250248
panelizer:
251249
version: '3.4'
252250
panels:
@@ -276,18 +274,14 @@ projects:
276274
download:
277275
type: git
278276
url: https://github.com/NuCivic/recline.git
279-
tag: 7.x-1.13.6
277+
tag: 7.x-1.13.7
280278
ref_field:
281279
download:
282280
type: git
283281
url: http://git.drupal.org/project/ref_field.git
284282
revision: 9dbf7cf
285283
patch:
286284
2360019: https://www.drupal.org/files/issues/ref_field-delete-insert-warning-2360019-5.patch
287-
remote_file_source:
288-
version: 1.x
289-
patch:
290-
2362487: https://www.drupal.org/files/issues/remote_file_source-location-content-dist_1.patch
291285
remote_stream_wrapper:
292286
download:
293287
type: git
@@ -329,13 +323,13 @@ projects:
329323
download:
330324
type: git
331325
url: https://github.com/NuCivic/taxonomy_fixtures.git
332-
revision: 485d92019d11a61de585707db8f49d0160bd03b2
326+
revision: b2f092c963f4a24afe1e6443eb9ff01c959079ed
333327
token:
334328
version: '1.7'
335329
uuid:
336330
version: '1.0'
337331
views:
338-
version: '3.16'
332+
version: '3.17'
339333
views_autocomplete_filters:
340334
version: '1.2'
341335
patch:

‎profiles/dkan/libraries/symfonyserializer/Mapping/Loader/YamlFileLoader.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use Symfony\Component\Serializer\Mapping\AttributeMetadata;
1616
use Symfony\Component\Serializer\Mapping\ClassMetadataInterface;
1717
use Symfony\Component\Yaml\Parser;
18-
use Symfony\Component\Yaml\Yaml;
1918

2019
/**
2120
* YAML File Loader.
@@ -114,7 +113,7 @@ private function getClassesFromYaml()
114113
$this->yamlParser = new Parser();
115114
}
116115

117-
$classes = $this->yamlParser->parse(file_get_contents($this->file), Yaml::PARSE_KEYS_AS_STRINGS);
116+
$classes = $this->yamlParser->parse(file_get_contents($this->file));
118117

119118
if (empty($classes)) {
120119
return array();

‎profiles/dkan/libraries/symfonyserializer/Tests/Encoder/YamlEncoderTest.php

+5-3
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,11 @@ public function testContext()
6161
$obj = new \stdClass();
6262
$obj->bar = 2;
6363

64-
$this->assertEquals(" foo: !php/object:O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}\n", $encoder->encode(array('foo' => $obj), 'yaml'));
64+
$legacyTag = " foo: !php/object:O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}\n";
65+
$spacedTag = " foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'\n";
66+
$this->assertThat($encoder->encode(array('foo' => $obj), 'yaml'), $this->logicalOr($this->equalTo($legacyTag), $this->equalTo($spacedTag)));
6567
$this->assertEquals(' { foo: null }', $encoder->encode(array('foo' => $obj), 'yaml', array('yaml_inline' => 0, 'yaml_indent' => 2, 'yaml_flags' => 0)));
66-
$this->assertEquals(array('foo' => $obj), $encoder->decode('foo: !php/object:O:8:"stdClass":1:{s:3:"bar";i:2;}', 'yaml'));
67-
$this->assertEquals(array('foo' => null), $encoder->decode('foo: !php/object:O:8:"stdClass":1:{s:3:"bar";i:2;}', 'yaml', array('yaml_flags' => 0)));
68+
$this->assertEquals(array('foo' => $obj), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml'));
69+
$this->assertEquals(array('foo' => null), $encoder->decode("foo: !php/object 'O:8:\"stdClass\":1:{s:3:\"bar\";i:2;}'", 'yaml', array('yaml_flags' => 0)));
6870
}
6971
}

‎profiles/dkan/libraries/symfonyserializer/composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"doctrine/annotations": "~1.0",
2929
"symfony/dependency-injection": "~3.4|~4.0",
3030
"doctrine/cache": "~1.0",
31-
"phpdocumentor/reflection-docblock": "~3.0"
31+
"phpdocumentor/reflection-docblock": "^3.0|^4.0"
3232
},
3333
"conflict": {
3434
"symfony/dependency-injection": "<3.4",

‎profiles/dkan/modules/contrib/entityreference/entityreference.info

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ files[] = tests/entityreference.admin.test
2929
files[] = tests/entityreference.feeds.test
3030
files[] = tests/entityreference.entity_translation.test
3131

32-
; Information added by Drupal.org packaging script on 2017-05-23
33-
version = "7.x-1.4"
32+
; Information added by Drupal.org packaging script on 2017-08-16
33+
version = "7.x-1.5"
3434
core = "7.x"
3535
project = "entityreference"
36-
datestamp = "1495557187"
36+
datestamp = "1502895850"
3737

‎profiles/dkan/modules/contrib/entityreference/entityreference.module

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php
22

3+
define('ENTITYREFERENCE_DENIED', '- Restricted access -');
4+
35
/**
46
* @file
57
* Entityreference primary module file.
@@ -1106,10 +1108,14 @@ function entityreference_autocomplete_callback_get_matches($type, $field, $insta
11061108
if (isset($tag_last)) {
11071109
// Get an array of matching entities.
11081110
$entity_labels = $handler->getReferencableEntities($tag_last, $instance['widget']['settings']['match_operator'], 10);
1109-
1111+
$denied_label = t(ENTITYREFERENCE_DENIED);
11101112
// Loop through the products and convert them into autocomplete output.
11111113
foreach ($entity_labels as $values) {
11121114
foreach ($values as $entity_id => $label) {
1115+
// Never autocomplete entities that aren't accessible.
1116+
if ($label == $denied_label) {
1117+
continue;
1118+
}
11131119
$key = "$label ($entity_id)";
11141120
// Strip starting/trailing white spaces, line breaks and tags.
11151121
$key = preg_replace('/\s\s+/', ' ', str_replace("\n", '', trim(decode_entities(strip_tags($key)))));

‎profiles/dkan/modules/contrib/entityreference/examples/entityreference_behavior_example/entityreference_behavior_example.info

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ core = 7.x
44
package = Fields
55
dependencies[] = entityreference
66

7-
; Information added by Drupal.org packaging script on 2017-05-23
8-
version = "7.x-1.4"
7+
; Information added by Drupal.org packaging script on 2017-08-16
8+
version = "7.x-1.5"
99
core = "7.x"
1010
project = "entityreference"
11-
datestamp = "1495557187"
11+
datestamp = "1502895850"
1212

‎profiles/dkan/modules/contrib/entityreference/plugins/selection/EntityReference_SelectionHandler_Generic.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ protected function reAlterQuery(SelectQueryInterface $query, $tag, $base_table)
309309
*/
310310
public function getLabel($entity) {
311311
$target_type = $this->field['settings']['target_type'];
312-
return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t('- Restricted access -');
312+
return entity_access('view', $target_type, $entity) ? entity_label($target_type, $entity) : t(ENTITYREFERENCE_DENIED);
313313
}
314314

315315
/**

‎profiles/dkan/modules/contrib/entityreference/tests/entityreference.handlers.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ class EntityReferenceHandlersTestCase extends DrupalWebTestCase {
271271
),
272272
'result' => array(
273273
'user' => array(
274-
$users['admin']->uid => '- Restricted access -',
274+
$users['admin']->uid => ENTITYREFERENCE_DENIED,
275275
$users['non_admin']->uid => $user_labels['non_admin'],
276276
),
277277
),

‎profiles/dkan/modules/contrib/entityreference/tests/modules/entityreference_feeds_test/entityreference_feeds_test.info

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ dependencies[] = feeds
88
dependencies[] = feeds_ui
99
dependencies[] = entityreference
1010

11-
; Information added by Drupal.org packaging script on 2017-05-23
12-
version = "7.x-1.4"
11+
; Information added by Drupal.org packaging script on 2017-08-16
12+
version = "7.x-1.5"
1313
core = "7.x"
1414
project = "entityreference"
15-
datestamp = "1495557187"
15+
datestamp = "1502895850"
1616

0 commit comments

Comments
 (0)