From 7b8f268843cdcca01a4cf37c02b1f95e53434c48 Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Wed, 29 Nov 2017 13:40:49 -0500
Subject: [PATCH] 7.x-1.3 Release (2)
---
.../custom/ocio_calendar/ocio_calendar.ds.inc | 21 ++--
.../ocio_calendar.features.field_base.inc | 26 +++++
.../ocio_calendar.features.field_instance.inc | 104 +++++++++---------
.../ocio_calendar.field_group.inc | 1 +
.../custom/ocio_calendar/ocio_calendar.info | 3 +-
.../ocio_calendar/ocio_calendar.strongarm.inc | 4 +-
.../ocio_taxonomy.features.taxonomy.inc | 8 ++
.../custom/ocio_taxonomy/ocio_taxonomy.info | 1 +
8 files changed, 100 insertions(+), 68 deletions(-)
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.ds.inc b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.ds.inc
index 2f17913e..2422b072 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.ds.inc
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.ds.inc
@@ -24,11 +24,6 @@ function ocio_calendar_ds_field_settings_info() {
),
),
),
- 'field_tags' => array(
- 'formatter_settings' => array(
- 'ft' => array(),
- ),
- ),
);
$export['node|calendar_entry|full'] = $ds_fieldsetting;
@@ -51,23 +46,23 @@ function ocio_calendar_ds_layout_settings_info() {
$ds_layout->settings = array(
'regions' => array(
'ds_content' => array(
- 0 => 'field_date',
- 1 => 'field_location_room_number',
+ 0 => 'field_location_room_number',
+ 1 => 'field_date',
2 => 'group_location',
3 => 'field_location_building',
- 4 => 'field_ocio_body',
- 5 => 'field_location_address',
- 6 => 'field_tags',
+ 4 => 'field_location_address',
+ 5 => 'field_ocio_body',
+ 6 => 'field_calendar_tags',
),
),
'fields' => array(
- 'field_date' => 'ds_content',
'field_location_room_number' => 'ds_content',
+ 'field_date' => 'ds_content',
'group_location' => 'ds_content',
'field_location_building' => 'ds_content',
- 'field_ocio_body' => 'ds_content',
'field_location_address' => 'ds_content',
- 'field_tags' => 'ds_content',
+ 'field_ocio_body' => 'ds_content',
+ 'field_calendar_tags' => 'ds_content',
),
'classes' => array(),
'wrappers' => array(
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_base.inc b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_base.inc
index 6a4c7547..47414750 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_base.inc
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_base.inc
@@ -10,6 +10,32 @@
function ocio_calendar_field_default_field_bases() {
$field_bases = array();
+ // Exported field_base: 'field_calendar_tags'.
+ $field_bases['field_calendar_tags'] = array(
+ 'active' => 1,
+ 'cardinality' => -1,
+ 'deleted' => 0,
+ 'entity_types' => array(),
+ 'field_name' => 'field_calendar_tags',
+ 'indexes' => array(
+ 'tid' => array(
+ 0 => 'tid',
+ ),
+ ),
+ 'locked' => 0,
+ 'module' => 'taxonomy',
+ 'settings' => array(
+ 'allowed_values' => array(
+ 0 => array(
+ 'vocabulary' => 'calendar_tags',
+ 'parent' => 0,
+ ),
+ ),
+ ),
+ 'translatable' => 0,
+ 'type' => 'taxonomy_term_reference',
+ );
+
// Exported field_base: 'field_location_address'.
$field_bases['field_location_address'] = array(
'active' => 1,
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_instance.inc b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_instance.inc
index 227161c5..1f86c7c5 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_instance.inc
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.features.field_instance.inc
@@ -10,6 +10,57 @@
function ocio_calendar_field_default_field_instances() {
$field_instances = array();
+ // Exported field_instance: 'node-calendar_entry-field_calendar_tags'.
+ $field_instances['node-calendar_entry-field_calendar_tags'] = array(
+ 'bundle' => 'calendar_entry',
+ 'default_value' => NULL,
+ 'deleted' => 0,
+ 'description' => '',
+ 'display' => array(
+ 'default' => array(
+ 'label' => 'above',
+ 'module' => 'taxonomy',
+ 'settings' => array(),
+ 'type' => 'taxonomy_term_reference_link',
+ 'weight' => 8,
+ ),
+ 'full' => array(
+ 'label' => 'inline',
+ 'module' => 'ds',
+ 'settings' => array(
+ 'taxonomy_term_link' => TRUE,
+ 'taxonomy_term_separator' => ', ',
+ ),
+ 'type' => 'ds_taxonomy_separator',
+ 'weight' => 3,
+ ),
+ 'teaser' => array(
+ 'label' => 'above',
+ 'settings' => array(),
+ 'type' => 'hidden',
+ 'weight' => 0,
+ ),
+ ),
+ 'ds_extras_field_template' => '',
+ 'entity_type' => 'node',
+ 'field_name' => 'field_calendar_tags',
+ 'label' => 'Tags',
+ 'required' => 0,
+ 'settings' => array(
+ 'user_register_form' => FALSE,
+ ),
+ 'widget' => array(
+ 'active' => 0,
+ 'module' => 'taxonomy',
+ 'settings' => array(
+ 'autocomplete_path' => 'taxonomy/autocomplete',
+ 'size' => 60,
+ ),
+ 'type' => 'taxonomy_autocomplete',
+ 'weight' => 3,
+ ),
+ );
+
// Exported field_instance: 'node-calendar_entry-field_date'.
$field_instances['node-calendar_entry-field_date'] = array(
'bundle' => 'calendar_entry',
@@ -315,58 +366,7 @@ function ocio_calendar_field_default_field_instances() {
'summary_rows' => 5,
),
'type' => 'text_textarea_with_summary',
- 'weight' => 6,
- ),
- );
-
- // Exported field_instance: 'node-calendar_entry-field_tags'.
- $field_instances['node-calendar_entry-field_tags'] = array(
- 'bundle' => 'calendar_entry',
- 'default_value' => NULL,
- 'deleted' => 0,
- 'description' => '',
- 'display' => array(
- 'default' => array(
- 'label' => 'above',
- 'module' => 'taxonomy',
- 'settings' => array(),
- 'type' => 'taxonomy_term_reference_link',
- 'weight' => 3,
- ),
- 'full' => array(
- 'label' => 'inline',
- 'module' => 'ds',
- 'settings' => array(
- 'taxonomy_term_link' => 1,
- 'taxonomy_term_separator' => ', ',
- ),
- 'type' => 'ds_taxonomy_separator',
- 'weight' => 3,
- ),
- 'teaser' => array(
- 'label' => 'above',
- 'settings' => array(),
- 'type' => 'hidden',
- 'weight' => 0,
- ),
- ),
- 'ds_extras_field_template' => '',
- 'entity_type' => 'node',
- 'field_name' => 'field_tags',
- 'label' => 'Tags',
- 'required' => 0,
- 'settings' => array(
- 'user_register_form' => FALSE,
- ),
- 'widget' => array(
- 'active' => 0,
- 'module' => 'taxonomy',
- 'settings' => array(
- 'autocomplete_path' => 'taxonomy/autocomplete',
- 'size' => 60,
- ),
- 'type' => 'taxonomy_autocomplete',
- 'weight' => 5,
+ 'weight' => 4,
),
);
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.field_group.inc b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.field_group.inc
index 8c77bdd6..e5f4a4dd 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.field_group.inc
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.field_group.inc
@@ -26,6 +26,7 @@ function ocio_calendar_field_group_info() {
0 => 'field_location_address',
1 => 'field_location_building',
2 => 'field_location_room_number',
+ 3 => 'field_tags',
),
'format_type' => 'fieldset',
'format_settings' => array(
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.info b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.info
index 7a0314b6..87f2f113 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.info
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.info
@@ -29,17 +29,18 @@ features[custom_breadcrumb][] = calendar_entry
features[ds_field_settings][] = node|calendar_entry|full
features[ds_layout_settings][] = node|calendar_entry|full
features[features_api][] = api:2
+features[field_base][] = field_calendar_tags
features[field_base][] = field_location_address
features[field_base][] = field_location_building
features[field_base][] = field_location_room_number
features[field_group][] = group_location|node|calendar_entry|form
features[field_group][] = group_location|node|calendar_entry|full
+features[field_instance][] = node-calendar_entry-field_calendar_tags
features[field_instance][] = node-calendar_entry-field_date
features[field_instance][] = node-calendar_entry-field_location_address
features[field_instance][] = node-calendar_entry-field_location_building
features[field_instance][] = node-calendar_entry-field_location_room_number
features[field_instance][] = node-calendar_entry-field_ocio_body
-features[field_instance][] = node-calendar_entry-field_tags
features[node][] = calendar_entry
features[variable][] = date_format_ocio_calendar_list
features[variable][] = date_format_ocio_calendar_node
diff --git a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.strongarm.inc b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.strongarm.inc
index c39c8a31..1df5c695 100644
--- a/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.strongarm.inc
+++ b/profiles/wcm_base/modules/custom/ocio_calendar/ocio_calendar.strongarm.inc
@@ -67,10 +67,10 @@ function ocio_calendar_strongarm() {
'weight' => '0',
),
'path' => array(
- 'weight' => '8',
+ 'weight' => '6',
),
'redirect' => array(
- 'weight' => '7',
+ 'weight' => '5',
),
),
'display' => array(),
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.taxonomy.inc b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.taxonomy.inc
index cde0e6b5..909c06dd 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.taxonomy.inc
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.features.taxonomy.inc
@@ -9,6 +9,14 @@
*/
function ocio_taxonomy_taxonomy_default_vocabularies() {
return array(
+ 'calendar_tags' => array(
+ 'name' => 'Calendar Tags',
+ 'machine_name' => 'calendar_tags',
+ 'description' => '',
+ 'hierarchy' => 0,
+ 'module' => 'taxonomy',
+ 'weight' => 0,
+ ),
'ocio_tags' => array(
'name' => 'Tags',
'machine_name' => 'ocio_tags',
diff --git a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
index fa884a42..d7b4fc37 100644
--- a/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
+++ b/profiles/wcm_base/modules/custom/ocio_taxonomy/ocio_taxonomy.info
@@ -38,6 +38,7 @@ features[field_instance][] = file-video-field_file_tags
features[field_instance][] = node-article-field_tags
features[field_instance][] = user-user-field_contact_group
features[field_instance][] = user-user-field_leadership_group
+features[taxonomy][] = calendar_tags
features[taxonomy][] = ocio_tags
features[taxonomy][] = wcm_file_tags
features[taxonomy][] = wcm_user_contact_group
--
GitLab