From 127dda2cc73c88acdff723b2534e4aebf2fb0521 Mon Sep 17 00:00:00 2001
From: Lucas Hedding <24691-lucashedding@users.noreply.drupalcode.org>
Date: Thu, 25 Jul 2024 15:34:49 +0000
Subject: [PATCH] Issue #3301918 by drumm, heddn, marvil07: SSO deployment
changes
---
...g_permissions.features.user_permission.inc | 28 -------------------
.../drupalorg_permissions.info | 4 ---
...drupalorg_user.features.field_instance.inc | 18 ++++++++----
.../drupalorg_user.field_group.inc | 5 ++--
4 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/features/drupalorg_permissions/drupalorg_permissions.features.user_permission.inc b/features/drupalorg_permissions/drupalorg_permissions.features.user_permission.inc
index 99dff5d9e..74ac322ef 100644
--- a/features/drupalorg_permissions/drupalorg_permissions.features.user_permission.inc
+++ b/features/drupalorg_permissions/drupalorg_permissions.features.user_permission.inc
@@ -484,15 +484,6 @@ function drupalorg_permissions_user_default_permissions() {
'module' => 'book',
);
- // Exported permission: 'admin tfa settings'.
- $permissions['admin tfa settings'] = array(
- 'name' => 'admin tfa settings',
- 'roles' => array(
- 'administrator' => 'administrator',
- ),
- 'module' => 'tfa',
- );
-
// Exported permission: 'administer CAPTCHA settings'.
$permissions['administer CAPTCHA settings'] = array(
'name' => 'administer CAPTCHA settings',
@@ -4485,25 +4476,6 @@ function drupalorg_permissions_user_default_permissions() {
'module' => 'user',
);
- // Exported permission: 'setup own tfa'.
- $permissions['setup own tfa'] = array(
- 'name' => 'setup own tfa',
- 'roles' => array(
- 'Documentation moderator' => 'Documentation moderator',
- 'Git administrator' => 'Git administrator',
- 'Git vetted user' => 'Git vetted user',
- 'Site moderator' => 'Site moderator',
- 'administrator' => 'administrator',
- 'community' => 'community',
- 'confirmed' => 'confirmed',
- 'content administrator' => 'content administrator',
- 'content moderator' => 'content moderator',
- 'security team' => 'security team',
- 'user administrator' => 'user administrator',
- ),
- 'module' => 'tfa_basic',
- );
-
// Exported permission: 'skip CAPTCHA'.
$permissions['skip CAPTCHA'] = array(
'name' => 'skip CAPTCHA',
diff --git a/features/drupalorg_permissions/drupalorg_permissions.info b/features/drupalorg_permissions/drupalorg_permissions.info
index 8eb6e8799..e581c209d 100644
--- a/features/drupalorg_permissions/drupalorg_permissions.info
+++ b/features/drupalorg_permissions/drupalorg_permissions.info
@@ -73,8 +73,6 @@ dependencies[] = security_review
dependencies[] = signature_permissions
dependencies[] = system
dependencies[] = taxonomy
-dependencies[] = tfa
-dependencies[] = tfa_basic
dependencies[] = translation
dependencies[] = user
dependencies[] = user_restrictions
@@ -133,7 +131,6 @@ features[user_permission][] = access site-wide contact form
features[user_permission][] = access user contact forms
features[user_permission][] = access user profiles
features[user_permission][] = add content to books
-features[user_permission][] = admin tfa settings
features[user_permission][] = administer CAPTCHA settings
features[user_permission][] = administer actions
features[user_permission][] = administer advanced pane settings
@@ -573,7 +570,6 @@ features[user_permission][] = revert revisions
features[user_permission][] = run security checks
features[user_permission][] = search content
features[user_permission][] = select account cancellation method
-features[user_permission][] = setup own tfa
features[user_permission][] = skip CAPTCHA
features[user_permission][] = skip comment approval
features[user_permission][] = translate content
diff --git a/features/drupalorg_user/drupalorg_user.features.field_instance.inc b/features/drupalorg_user/drupalorg_user.features.field_instance.inc
index 307f527fa..3d048c0c2 100644
--- a/features/drupalorg_user/drupalorg_user.features.field_instance.inc
+++ b/features/drupalorg_user/drupalorg_user.features.field_instance.inc
@@ -707,7 +707,7 @@ function drupalorg_user_field_default_field_instances() {
// Exported field_instance: 'user-user-field_first_name'.
$field_instances['user-user-field_first_name'] = array(
'bundle' => 'user',
- 'default_value' => NULL,
+ 'default_value' => array(),
'deleted' => 0,
'description' => '',
'display' => array(
@@ -728,11 +728,14 @@ function drupalorg_user_field_default_field_instances() {
),
'widget' => array(
'active' => 1,
- 'module' => 'text',
+ 'module' => 'field_extrawidgets',
'settings' => array(
+ 'display_empty' => 0,
+ 'formatter' => '',
+ 'formatter_settings' => array(),
'size' => 30,
),
- 'type' => 'text_textfield',
+ 'type' => 'field_extrawidgets_read_only',
'weight' => 47,
),
);
@@ -836,7 +839,7 @@ function drupalorg_user_field_default_field_instances() {
// Exported field_instance: 'user-user-field_last_name'.
$field_instances['user-user-field_last_name'] = array(
'bundle' => 'user',
- 'default_value' => NULL,
+ 'default_value' => array(),
'deleted' => 0,
'description' => '',
'display' => array(
@@ -857,11 +860,14 @@ function drupalorg_user_field_default_field_instances() {
),
'widget' => array(
'active' => 1,
- 'module' => 'text',
+ 'module' => 'field_extrawidgets',
'settings' => array(
+ 'display_empty' => 0,
+ 'formatter' => '',
+ 'formatter_settings' => array(),
'size' => 30,
),
- 'type' => 'text_textfield',
+ 'type' => 'field_extrawidgets_read_only',
'weight' => 48,
),
);
diff --git a/features/drupalorg_user/drupalorg_user.field_group.inc b/features/drupalorg_user/drupalorg_user.field_group.inc
index 7735ff0a6..f8b3c4df7 100644
--- a/features/drupalorg_user/drupalorg_user.field_group.inc
+++ b/features/drupalorg_user/drupalorg_user.field_group.inc
@@ -109,10 +109,10 @@ function drupalorg_user_field_group_info() {
$field_group->entity_type = 'user';
$field_group->bundle = 'user';
$field_group->mode = 'form';
- $field_group->parent_name = 'group_user_personal';
+ $field_group->parent_name = '';
$field_group->data = array(
'label' => 'Name',
- 'weight' => '11',
+ 'weight' => '1',
'children' => array(
0 => 'field_first_name',
1 => 'field_last_name',
@@ -497,7 +497,6 @@ function drupalorg_user_field_group_info() {
6 => 'field_user_pronouns',
7 => 'field_slack',
8 => 'picture',
- 9 => 'group_name',
),
'format_type' => 'tab',
'format_settings' => array(
--
GitLab