From c6d963a2db69c146b38178db93273dbbaa9f6b0b Mon Sep 17 00:00:00 2001
From: Chris Gross <gross.364@osu.edu>
Date: Thu, 10 Mar 2016 15:24:21 -0500
Subject: [PATCH] daily build
---
profiles/wcm_base/CHANGELOG.txt | 5 +++++
.../wcm_user_config.features.features_overrides.inc | 2 --
.../wcm_user_config/wcm_user_config.features.inc | 2 --
.../wcm_user_config.features.user_permission.inc | 12 ++++++++++++
4 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt
index 260d0e09..37a5426d 100644
--- a/profiles/wcm_base/CHANGELOG.txt
+++ b/profiles/wcm_base/CHANGELOG.txt
@@ -1,3 +1,8 @@
+WCM Base 7.x-1.x, 2016-03-10
+----------------------------
+- WCM User Config: Allow Site Managers and Site Builders to cancel
+ non-administrative user accounts.
+
WCM Base 7.x-1.x, 2016-03-09
----------------------------
- OCIO SimpleSAMLphp Auth: Check and correct SAML insallation directory
diff --git a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
index 687e98a7..f7ee9bd3 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.features_overrides.inc
@@ -65,8 +65,6 @@ function wcm_user_config_features_override_default_overrides() {
7 => 0,
3 => 0,
),
- 'autocomplete_items' => 10,
- 'autocomplete_min_chars' => 0,
'autocomplete_raw_suggestion' => 1,
'autocomplete_raw_dropdown' => 1,
'autocomplete_dependent' => 0,
diff --git a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
index 4390c872..50a0bb0c 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.inc
@@ -63,8 +63,6 @@ function wcm_user_config_views_default_views_alter(&$data) {
7 => 0,
3 => 0,
),
- 'autocomplete_items' => 10,
- 'autocomplete_min_chars' => 0,
'autocomplete_raw_suggestion' => 1,
'autocomplete_raw_dropdown' => 1,
'autocomplete_dependent' => 0,
diff --git a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
index 3a7fa19d..98537fd2 100644
--- a/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
+++ b/profiles/wcm_base/modules/custom/wcm_user_config/wcm_user_config.features.user_permission.inc
@@ -136,6 +136,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 2',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
@@ -145,6 +147,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 4',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
@@ -154,6 +158,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 5',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
@@ -163,6 +169,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 6',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
@@ -172,6 +180,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 7',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
@@ -181,6 +191,8 @@ function wcm_user_config_user_default_permissions() {
'name' => 'cancel users with role 8',
'roles' => array(
'administrator' => 'administrator',
+ 'site builder' => 'site builder',
+ 'site manager' => 'site manager',
),
'module' => 'administerusersbyrole',
);
--
GitLab