7.x-1.13.1 release

GetDKAN · Feb 27, 2017 · 368f8ab · 368f8ab
1 parent a5293f1
commit 368f8ab
Show file tree

Hide file tree

Showing 40 changed files with 108 additions and 65 deletions.
diff --git a/profiles/dkan/CHANGELOG.txt b/profiles/dkan/CHANGELOG.txt
@@ -1,4 +1,13 @@
-7.x-1.x
+7.x-1.13.x
+--------------------------
+ - #1709 Changed function dkan sitewide conversion homepage to fix problem with link entity attribute. This attribute need to be a boolean.
+ - #1742 Fix home page HTML <head><title> so that it's just the site name (not the node or panel title)
+ - #1747 Update DKAN API link to use the RTD documentation page.
+ - #1730 Fix logic error for front page in theme causing error messages on homepage
+ - #1728 Added a tag @defaultHomepage to a topic test which relies on homepage content.
+ - #5807 Fix panelizer permissions to hide 'Customize Display' button
+
+7.x-1.13
 --------------------------
  - #1719 Added site details to settings nuboot_radix to allow change site name, slogan, e-amail address for site manager.
  - #1717 Upgrading Drupal to 7.54

diff --git a/profiles/dkan/dkan.info b/profiles/dkan/dkan.info
@@ -124,4 +124,4 @@ dependencies[] = dkan_datastore
 dependencies[] = dkan_datastore_api
 dependencies[] = open_data_schema_map_dkan
 dependencies[] = visualization_entity_charts_dkan
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/dkan.profile b/profiles/dkan/dkan.profile
@@ -504,8 +504,8 @@ function dkan_bueditor_markdown_install() {
     ->fetchField();
 
   $data = array(
-    'html' => ['default' => $eid, 'alternative' => 0],
-    'plain_text' => ['plain_text' => 0, 'alternative' => 0],
+    'html' => array('default' => $eid, 'alternative' => 0),
+    'plain_text' => array('plain_text' => 0, 'alternative' => 0),
   );
 
   db_insert('bueditor_plus_profiles')

diff --git a/profiles/dkan/docs/introduction/installation.rst b/profiles/dkan/docs/introduction/installation.rst
@@ -25,7 +25,7 @@ Repository <https://github.com/NuCivic/dkan>`__ is a Drupal
 *installation profile*. To set up a working website using DKAN, you will
 need to acquire or build a full DKAN distribution of Drupal.
 
-.. tip:: `DKAN Starter <https://github.com/NuCivic/dkan-starter>`_ is project
+.. tip:: `DKAN Starter <http://dkan-starter.readthedocs.io>`_ is project
   containing a prebuilt version of DKAN and the tools `Granicus
   <https://www.granicus.com/>`_ uses for our own implementations and
   deployments. Learn more advanced workflows in that project's

diff --git a/profiles/dkan/docs/releases/notes/1.13.1.md b/profiles/dkan/docs/releases/notes/1.13.1.md
@@ -0,0 +1,15 @@
+# DKAN 1.13.1 Release Notes
+
+This is a "patch" release of DKAN, containing bug fixes and minor updates to DKAN 1.13, but adding no new functionality. It was released very shortly after 1.13 to address bugs that surfaced during deployments and upgrades. If you have not yet upgraded to 1.13, upgrade _directly_ to this release and skip 1.13; if you have already upgraded, we recommend updating to 1.13.1 immediately. 
+
+[See full 1.13 release notes here](https://github.com/NuCivic/dkan/releases/tag/7.x-1.13).
+
+
+## Improvements in this release
+
+ - Fixed a bug in the [home page conversion function](https://github.com/NuCivic/dkan/blob/f6d58c0751e9fe16016cb289c17697f4d44d1059/modules/dkan/dkan_sitewide/dkan_sitewide.module#L297)
+ - Fixed the page title (`<head><title>`) so that it's just the site name (not the node or panel title)
+ - Updated the DKAN API link on dataset pages to use the new [documentation site page](http://docs.getdkan.com/en/latest/apis/index.html).
+ - Fixed error messages appearing on homepage after upgrade
+ - Fixed panelizer permissions to hide the "Customize Display" button for Site Managers.
+ - Additional minor bug fixes to code and tests
diff --git a/profiles/dkan/docs/releases/notes/1.13.md b/profiles/dkan/docs/releases/notes/1.13.md
@@ -42,20 +42,24 @@ One of the most basic content types on DKAN is a _page_. And though the content
 
 ### Even more permissions for Site Managers
 
-- Theme Settings: Includes page elements and ability to add custom logo and favicon.
-- Colorizer: Ability to create custom color schemes for a DKAN site.
-- Open Data Schema Mapper (ODSM): Ability to add, edit, and delete APIs and their mappings to DKAN fields.
-- Menus: Permission to manage the main menu links by adding, editing, and deleting links.
-- Enabling External Previews: Site Managers can enable previews so that site visitors can look at Resource contents with visualization tools, CartoDB and ArcGIS.
+- Theme Settings: Includes page elements and ability to add custom logo and favicon from "Site Configuration > Theme Settings" at /admin/appearance/settings
+- Colorizer: Ability to create custom color schemes for a DKAN site from "Site Configuration > Colorizer" at /admin/appearance/colorizer
+- Open Data Schema Mapper (ODSM): Ability to add, edit, and delete APIs and their mappings to DKAN fields from "Site Configuration > Open Data Schema Mapper" at /admin/config/services/odsm
+- Menus: Permission to manage the main menu links by adding, editing, and deleting links from "Site Configuration > Menu" at /admin/structure/menu
+- Topics Icons: When adding or editing terms in the Topics taxonomy at path /admin/structure/taxonomy/dkan_topics, site managers can choose an "Icon Type" of either "Font Icon" or "Image." If they choose "Font Icon," the edit form displays a list of available icons from which to choose. If they choose "Image," the form lets them upload an image.
+- Enabling External Previews: Site Managers can enable previews so that site visitors can look at Resource contents with visualization tools, Carto and ArcGIS. To enable External Previews, go "DKAN > Data Previews" at /admin/dkan/dataset_preview
 - DCAT and POD validation: Site Managers can select the settings for how Datasets are validated against Project Open Data and DCAT-AP standards.
-- Order of Groups if using the featured groups block: Site Managers can arrange the order in which Groups appear in the featured group block.
-- Recline size configuration: Manage size constraints for Recline, which powers internal previews.
+- Site managers can confirm that the website's data.json feed is working correctly by using the POD online validator at https://labs.data.gov/dashboard/validate
+- Site managers can confirm that the website's DCAT feed is working correctly from Site Configuration > Open Data Schema Mapper > DCAT Validation at /admin/config/services/odsm/validate/dcat or by using the DCAT online validator at http://www.dcat.be/validator/
 
-### Open Data Federal Extras is now part of core DKAN
+- Order of Groups if using the featured groups block: Site Managers can arrange the order in which Groups appear in the featured group block from "DKAN > Featured Groups Sort Order" at /admin/dkan/featured-groups-sort-order
+- Recline size configuration: Manage size constraints for Recline, which powers internal previews, from "DKAN > Recline Configuration" at /admin/dkan/recline
 
-Project Open Data (POD) sets a standard for the information about datasets (metadata) included when the data is published. DKAN  collects metadata with fields on the Dataset form when the data is published. For most agencies, the fields reflect basic requirements. However _US federal_ agencies are required to provide additional information about the data published. The extra fields appear as part of the Dataset form with our Federal Extras module.
+### Open Data Federal Extras (ODFE) is now part of core DKAN
 
-We've moved this module into core DKAN so that it's part of every install, though not enabled by default. When enabled, the Federal Extras module makes federal agencies compliant with POD standards.
+Project Open Data (POD) sets a standard for the information about datasets (metadata) included when the data is published. DKAN  collects metadata with fields on the Dataset form when the data is published. For most agencies, the fields reflect basic requirements. However _US federal_ agencies are required to provide additional information about the data published. The extra fields appear as part of the Dataset form with our ODFE module.
+
+We've moved this module into core DKAN so that it's part of every install, though not enabled by default. When enabled, the ODFE module makes federal agencies compliant with POD standards.
 
 Get more details on [Federal Extras](http://docs.getdkan.com/en/latest/components/federal-extras.html) on DKAN.
 
@@ -79,8 +83,9 @@ Get more details on the [Datastore API](http://docs.getdkan.com/en/latest/apis/d
 
 A number of metadata fields that are common requirements for open data standards like Project Open Data and DCAT-AP have been added to the basic dataset content type in DKAN. These fields are:
 
+- Data Standard
 - Data Dictionary Type
-- Landing Page
+- Homepage URL
 - Data Standard ([conformsTo](https://project-open-data.cio.gov/v1.1/schema/#conformsTo))
 - [Rights](https://project-open-data.cio.gov/v1.1/schema/#rights)
 - Language
@@ -100,12 +105,12 @@ Additionally, the admin theme setting is set to use the default theme rather tha
 
 ### Added POD-based validation on Datasets
 
-A new option was added on DKAN Dataset Forms in order to enable form validation based on Project Open Data. If the validation is enabled then all POD required fields will be also required in DKAN.
+A new option was added on DKAN Dataset Forms at /admin/dkan/dataset_forms in order to enable form validation based on Project Open Data. If "Validate dataset form according to Project Open Data" is enabled, then all POD required fields will be also required in DKAN. See the POD schema for details of the validation standards: https://project-open-data.cio.gov/v1.1/schema/
 
 ### Minor improvements
 - We added more frequency update options to the Dataset form to comply with [Project Open Data standards](https://project-open-data.cio.gov/iso8601_guidance/#accrualperiodicity)
 - Added icons to the Topics drop-down menu.
-- Renamed the default HTML text format to from "HTML" to "Markdown HTML." This is also reflected in the UI when adding new content.
+- Renamed the default HTML text format from "HTML" to "Markdown HTML." This is also reflected in the UI when adding new content.
 - Made URLs in the _Additional info_ section of Datasets display properly and made them clickable
 - Removed the Conditional Fields module from DKAN, which was adding bloat and creating lots of unwanted artifacts in features, and only used by two fields. A few lines of Form API code was enough to reproduce the functionality.
 - Several improvements were made to enhance accessibility and [508 compliance](https://www.section508.gov/) on DKAN including labels, alt text in the UI, table headers and more.
@@ -118,7 +123,8 @@ Some DKAN features weren't working as expected and causing issues. We fixed thos
 - Data proxy for Google spreadsheets was broken. This meant that the data in a Resource could not be parsed properly, and these files could not be used to generate Charts with the DKAN Visualization Entity. We fixed this so Resources that are not internal to DKAN can be used to create a Chart on DKAN.
 - The DKAN API endpoints for JSON and RDF outputs did not generate the proper file when called. We fixed this so that the JSON endpoint works normally. With our new DCAT-AP compliance feature, the RDF output will generate an XML file.
 - Several bugs in the Visualization entity resulted in a frustrating user experience when attempting to create a Chart. A number of fixes were made to result in the expected behavior of the Chart.
-- Only certain roles had permission to edit text formats, which resulted in many users unable to add text to their content. We fixed that so now all roles can add text to a text box regardless of the text format.
+- Only certain roles had permission to use the "Markdown HTML" text format, which resulted in many users unable to edit text to content which had been created using that format. We fixed that so now all roles can add text to a text box regardless of the text format.
+- The toolbar that appears at the top of the text area when using the "Markdown" text format used to include some buttons for styling options that DKAN did not actually support, which created confusion. We've removed the unsupported buttons from the toolbar so it only contains supported options (headings, bold, italic, lists, blockquote, link, image, line break).
 
 ## Upgrading to the latest version
 
@@ -153,6 +159,12 @@ We have moved DKAN's technical documentation from the Drupal-based site where it
 
 ## Special Notes
 
+**Front Page** - [Upgrade Instructions](https://github.com/NuCivic/dkan/blob/7.x-1.x/modules/dkan/dkan_fixtures/modules/dkan_default_content/README.md)
+
+Front page configuration has been removed from features and the dkan_sitewide_demo_front feature has been deprecated. To save existing front page configuration, run the following command `drush php-eval "dkan_sitewide_convert_panel_page('<page-name>', TRUE);"` This will convert the front page to a panelized node.
+
+Also note that if you use any of the default DKAN blocks for your front page, some may dissapear after the upgrade. A user with the administrator role should be able to restore them by editing the panel and finding them in the Miscellaneous list.
+
 **Added Modules**
 
   - DKAN Harvest
@@ -179,10 +191,6 @@ To remove newly untracked files run:
 
   `git clean -f`
 
-**Front Page** - [Upgrade Instructions](https://github.com/NuCivic/dkan/blob/7.x-1.x/modules/dkan/dkan_fixtures/modules/dkan_default_content/README.md)
-
-Front page configuration has been removed from features and the dkan_sitewide_demo_front feature has been deprecated. To save existing front page configuration, run the following command `drush php-eval "dkan_sitewide_convert_panel_page(<page-name>);"` This will convert the front page to a panelized node
-
 ## Known issues
 
-* Site managers do not have permission to see the Project Open Data validator screen, which tells them if their site is currently producing a valid data.json. This will be fixed in 1.13.1. The equivilant screen _is_ availabe for DCAT-AP, under the configuration menu.
+* Site managers do not have permission to see the Project Open Data validator screen, which tells them if their site is currently producing a valid data.json. This will be fixed in 1.13.1. The equivalant screen _is_ availabe for DCAT-AP, under the configuration menu. If you need to check your site's data.json feed in the meantime, you can use Data.gov's online POD validator at https://labs.data.gov/dashboard/validate.
diff --git a/profiles/dkan/drupal-org.make b/profiles/dkan/drupal-org.make
@@ -3,9 +3,9 @@ api: '2'
 core: 7.x
 includes:
 - https://raw.githubusercontent.com/NuCivic/visualization_entity/7.x-1.0/visualization_entity.make
-- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13/open_data_schema_map.make
+- https://raw.githubusercontent.com/NuCivic/open_data_schema_map/7.x-1.13.1/open_data_schema_map.make
 - https://raw.githubusercontent.com/NuCivic/leaflet_draw_widget/cb0d2b0e8c733a5f997038bd0b444ab2b6072542/leaflet_widget.make
-- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13/recline.make
+- https://raw.githubusercontent.com/NuCivic/recline/7.x-1.13.1/recline.make
 projects:
   admin_menu:
     version: 3.0-rc5
@@ -246,7 +246,7 @@ projects:
     download:
       type: git
       url: https://github.com/NuCivic/open_data_schema_map.git
-      tag: 7.x-1.13
+      tag: 7.x-1.13.1
   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
+      tag: 7.x-1.13.1
   ref_field:
     download:
       type: git

diff --git a/profiles/dkan/libraries/spyc/Spyc.php b/profiles/dkan/libraries/spyc/Spyc.php
@@ -1,7 +1,7 @@
 <?php
 /**
    * Spyc -- A Simple PHP YAML Class
-   * @version 0.5.1
+   * @version 0.6.2
    * @author Vlad Andersen <vlad.andersen@gmail.com>
    * @author Chris Wanstrath <chris@ozmm.org>
    * @link https://github.com/mustangostang/spyc/

diff --git a/profiles/dkan/libraries/symfonyserializer/composer.json b/profiles/dkan/libraries/symfonyserializer/composer.json
@@ -31,6 +31,7 @@
         "phpdocumentor/reflection-docblock": "~3.0"
     },
     "conflict": {
+        "symfony/dependency-injection": "<3.2",
         "symfony/property-access": ">=3.0,<3.0.4|>=2.8,<2.8.4",
         "symfony/property-info": "<3.1",
         "symfony/yaml": "<3.1"

diff --git a/...les/contrib/open_data_schema_map/modules/open_data_schema_ckan/open_data_schema_ckan.info b/...les/contrib/open_data_schema_map/modules/open_data_schema_ckan/open_data_schema_ckan.info
@@ -5,4 +5,4 @@ package = Open Data
 dependencies[] = features
 dependencies[] = open_data_schema_map
 dependencies[] = pathauto
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/...les/contrib/open_data_schema_map/modules/open_data_schema_dcat/open_data_schema_dcat.info b/...les/contrib/open_data_schema_map/modules/open_data_schema_dcat/open_data_schema_dcat.info
@@ -6,4 +6,4 @@ dependencies[] = features
 dependencies[] = open_data_schema_map
 dependencies[] = open_data_schema_map_xml_output
 dependencies[] = pathauto
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/...a_schema_map/modules/open_data_schema_map_xml_output/open_data_schema_map_xml_output.info b/...a_schema_map/modules/open_data_schema_map_xml_output/open_data_schema_map_xml_output.info
@@ -3,4 +3,4 @@ description = Provides xml output for for Open Data Schema Map.
 core = 7.x
 package = Open Data
 dependencies[] = open_data_schema_map
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/...dules/contrib/open_data_schema_map/modules/open_data_schema_pod/open_data_schema_pod.info b/...dules/contrib/open_data_schema_map/modules/open_data_schema_pod/open_data_schema_pod.info
@@ -4,4 +4,4 @@ core = 7.x
 package = Open Data
 dependencies[] = features
 dependencies[] = open_data_schema_map
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/contrib/open_data_schema_map/open_data_schema_map.info b/profiles/dkan/modules/contrib/open_data_schema_map/open_data_schema_map.info
@@ -8,4 +8,4 @@ dependencies[] = features
 dependencies[] = token
 files[] = open_data_schema_map.features.inc
 files[] = test/open_data_schema_map_api.test
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/contrib/recline/recline.info b/profiles/dkan/modules/contrib/recline/recline.info
@@ -6,4 +6,4 @@ dependencies[] = libraries
 dependencies[] = file
 scripts[] = js/jsondataview.js
 scripts[] = js/restdataview.js
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info b/profiles/dkan/modules/dkan/dkan_data_dashboard/dkan_data_dashboard.info
@@ -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.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info b/profiles/dkan/modules/dkan/dkan_data_story/dkan_data_story.info
@@ -55,4 +55,4 @@ features_exclude[dependencies][image] = image
 features_exclude[dependencies][strongarm] = strongarm
 features_exclude[dependencies][taxonomy] = taxonomy
 no autodetect = 1
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info b/profiles/dkan/modules/dkan/dkan_dataset/dkan_dataset.info
@@ -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.13
+version = 7.x-1.13.1
diff --git a/...ules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info b/...ules/dkan/dkan_dataset/modules/dkan_dataset_content_types/dkan_dataset_content_types.info
@@ -121,4 +121,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.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_groups/dkan_dataset_groups.info
@@ -73,4 +73,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.13
+version = 7.x-1.13.1
diff --git a/...s/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info b/...s/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_rest_api/dkan_dataset_rest_api.info
@@ -10,4 +10,4 @@ features[ctools][] = services:services:3
 features[features_api][] = api:2
 features[services_endpoint][] = dkan_dataset_api
 mtime = 1417998121
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info b/profiles/dkan/modules/dkan/dkan_dataset/modules/dkan_dataset_voting/dkan_dataset_voting.info
@@ -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.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info b/profiles/dkan/modules/dkan/dkan_datastore/dkan_datastore.info
@@ -22,4 +22,4 @@ features[views_view][] = datasets
 files[] = includes/Datastore.inc
 files[] = includes/DkanDatastore.inc
 files[] = includes/DkanDatastoreFastImport.inc
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info b/profiles/dkan/modules/dkan/dkan_datastore/modules/dkan_datastore_api/dkan_datastore_api.info
@@ -3,4 +3,4 @@ description = Access datastore info over json.
 package = DKAN API
 core = 7.x
 dependencies[] = services
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/...es/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info b/...es/dkan/dkan_datastore/modules/dkan_datastore_fast_import/dkan_datastore_fast_import.info
@@ -3,4 +3,4 @@ description = Enable fast import for resources
 core = 7.x
 package = DKAN
 dependencies[] = dkan_datastore
-version = 7.x-1.13
+version = 7.x-1.13.1
diff --git a/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.features.roles_permissions.inc b/profiles/dkan/modules/dkan/dkan_permissions/dkan_permissions.features.roles_permissions.inc
@@ -252,17 +252,11 @@ function dkan_permissions_default_roles_permissions() {
       'administer nodes' => TRUE,
       'administer open data schema mapper' => TRUE,
       'administer panelizer node data_dashboard content' => TRUE,
-      'administer panelizer node data_dashboard defaults' => TRUE,
       'administer panelizer node data_dashboard layout' => TRUE,
-      'administer panelizer node data_dashboard overview' => TRUE,
       'administer panelizer node dkan_data_story content' => TRUE,
-      'administer panelizer node dkan_data_story defaults' => TRUE,
       'administer panelizer node dkan_data_story layout' => TRUE,
-      'administer panelizer node dkan_data_story overview' => TRUE,
       'administer panelizer node page content' => TRUE,
-      'administer panelizer node page defaults' => TRUE,
       'administer panelizer node page layout' => TRUE,
-      'administer panelizer node page overview' => TRUE,
       'administer panels layouts' => TRUE,
       'administer panels styles' => TRUE,
       'administer taxonomy' => TRUE,