Skip to content
Snippets Groups Projects
Commit f3dae669 authored by Chris Gross's avatar Chris Gross
Browse files

daily build

parent 072bd04e
No related branches found
No related tags found
No related merge requests found
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.
......
......@@ -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.
......
......@@ -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;
......
......@@ -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"
......@@ -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
......
......@@ -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().
*/
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment