From f3dae6699b2f04cb9cc0a6be4259309a5b6248ca Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Mon, 16 Nov 2015 14:26:27 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 6 ++++-
.../uuid_features/includes/modules/book.inc | 2 +-
.../includes/uuid_user.features.inc | 26 ++++++++++---------
.../contrib/uuid_features/uuid_features.info | 6 ++---
.../uuid_features/uuid_features.module | 3 +++
.../wcm_user_profile.features.inc | 9 +++++++
.../wcm_user_profile/wcm_user_profile.info | 1 +
7 files changed, 36 insertions(+), 17 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 9bf97f57..cf307175 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,6 +1,10 @@
+WCM Base 7.x-1.x, 2015-11-16
+----------------------------
+- WCM User Profile: Disable panelizer in user profile pages.
+
WCM Base 7.x-1.x, 2015-11-10
----------------------------
-- OCIO Media Gallery: Created image gallery view pane with tag filtering.
+- WCM Media Gallery: Created image gallery view pane with tag filtering.
- OCIO News: Add tag filtering to news panes.
- OCIO Panels Settings: Hide redirect settings on fieldable panel panes.
- OCIO User Config: Replace username filter with real name filter on admin page.
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc
index 21fea491..1af7c91f 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/modules/book.inc
@@ -78,7 +78,7 @@ function book_uuid_node_features_rebuild_alter($node, $module) {
// Set up node as for add child page.
$node->book['plid'] = $parent_node->book['mlid'];
$node->book['menu_name'] = $parent_node->book['menu_name'];
- $node->book['weight'] = $node->book['weight'];
+ $node->book['weight'] = $parent_node->book['weight'];
}
else {
// Add to pending.
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
index f156ae1e..6fdf61ee 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
+++ b/profiles/wcm_base/modules/contrib/uuid_features/includes/uuid_user.features.inc
@@ -10,18 +10,20 @@
function uuid_user_features_export_options() {
$options = array();
- $query = db_select('users', 'u')
- ->fields('u', array('uid', 'name', 'mail', 'uuid'))
- ->condition('u.uid', 0, '>')
- ->orderBy('u.name', 'ASC')
- ->addTag('uuid_user_features_export_options');
-
- $results = $query->execute()->fetchAll();
- foreach ($results as $user) {
- $options[$user->uuid] = t('@name: @mail', array(
- '@name' => $user->name,
- '@mail' => $user->mail,
- ));
+ if (variable_get('uuid_features_entity_user_user', FALSE)) {
+ $query = db_select('users', 'u')
+ ->fields('u', array('uid', 'name', 'mail', 'uuid'))
+ ->condition('u.uid', 0, '>')
+ ->orderBy('u.name', 'ASC')
+ ->addTag('uuid_user_features_export_options');
+
+ $results = $query->execute()->fetchAll();
+ foreach ($results as $user) {
+ $options[$user->uuid] = t('@name: @mail', array(
+ '@name' => $user->name,
+ '@mail' => $user->mail,
+ ));
+ }
}
return $options;
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
index d83cf180..f8527a98 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.info
@@ -8,9 +8,9 @@ package = Features
configure = admin/structure/features/uuid_features
-; Information added by Drupal.org packaging script on 2015-08-04
-version = "7.x-1.0-alpha4+75-dev"
+; Information added by Drupal.org packaging script on 2015-11-16
+version = "7.x-1.0-alpha4+78-dev"
core = "7.x"
project = "uuid_features"
-datestamp = "1438668540"
+datestamp = "1447661660"
diff --git a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
index 4e5ac682..689edb4c 100644
--- a/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
+++ b/profiles/wcm_base/modules/contrib/uuid_features/uuid_features.module
@@ -64,6 +64,7 @@ function uuid_features_entity_info_alter(&$entity_info) {
'commerce_product',
'field_collection_item',
'paragraphs_item',
+ 'user',
);
if (module_exists('file_entity')) {
$entity_types[] = 'file';
@@ -661,6 +662,8 @@ function uuid_features_file_field_import(&$import, $entity_type, $module = NULL)
*
* @param object &$file
* The file, passed by reference.
+ * @param string $module
+ * The module name.
*
* @return bool
* TRUE on success. On success the $file object will have a valid
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
index 62e87b8b..9730b77f 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.features.inc
@@ -16,6 +16,15 @@ function wcm_user_profile_ctools_plugin_api($module = NULL, $api = NULL) {
}
}
+/**
+ * Implements hook_strongarm_alter().
+ */
+function wcm_user_profile_strongarm_alter(&$data) {
+ if (isset($data['panelizer_defaults_user_user'])) {
+ $data['panelizer_defaults_user_user']->value['status'] = 0; /* WAS: 1 */
+ }
+}
+
/**
* Implements hook_image_default_styles().
*/
diff --git a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
index 6cfa947c..22f75372 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
+++ b/profiles/wcm_base/modules/custom/wcm_user_profile/wcm_user_profile.info
@@ -22,6 +22,7 @@ features[ds_fields][] = email
features[ds_layout_settings][] = user|user|form
features[ds_layout_settings][] = user|user|full
features[features_api][] = api:2
+features[features_overrides][] = variable.panelizer_defaults_user_user.value|status
features[field_base][] = field_bio
features[field_base][] = field_first_name
features[field_base][] = field_job_title
--
GitLab