From e5b3ab12e0f36a78f7167f5611065a1042f9ed19 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 24 Jan 2019 16:42:05 +0100
Subject: [PATCH] OO-3719: allow bulk change with only status changes, wording
---
.../org/olat/registration/_i18n/LocalStrings_de.properties | 6 +++---
.../org/olat/registration/_i18n/LocalStrings_en.properties | 2 +-
.../org/olat/user/ui/admin/UserSearchTableController.java | 7 ++++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
index be4f34b7d94..ad014c705e4 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_de.properties
@@ -92,7 +92,7 @@ reg.notiEmail.subject=Neuer OpenOLAT-Benutzer\: {1} {2} ({0})
reg.subject=Registrierungsschl\u00FCssel f\u00FCr OpenOLAT
reg.wherefrom=Diese Anfrage an den Server {0} wurde am {1} \nvon der IP-Adresse {2} abgeschickt.
registration.form.cancelled=Sie haben die Registrierung abgebrochen.
-registration.pending.notification.mail=Pending user creation notification email
+registration.pending.notification.mail=E-Mail Benachrichtigung f\u00FCr ausstehende Benutzer
registration.pending.prop.name1=Benutzer-Attributename 1
registration.pending.prop.name2=Benutzer-Attributename 2
registration.pending.prop.name3=Benutzer-Attributename 3
@@ -103,10 +103,10 @@ registration.pending.prop.value2=Benutzer-Attributewert 2
registration.pending.prop.value3=Benutzer-Attributewert 3
registration.pending.prop.value4=Benutzer-Attributewert 4
registration.pending.prop.value5=Benutzer-Attributewert 5
-registration.pending.status=User state after self registration
+registration.pending.status=Benutzerstatus nach Selbstregistrierung
registration.pending.status.active=Active
registration.pending.status.pending=H\u00E4ngig
-registration.pending.status.pending.props=H\u00E4ngig wenn ein von den folgenden Benutzerproperties stimmt
+registration.pending.status.pending.props=H\u00E4ngig, wenn eines der folgenden Benutzerattribute zutrifft
regkey.missing=Der Registrierungsschl\u00FCssel fehlt. Fordern Sie bitte einen neuen an.
regkey.missingentry=Dieser Registrierungsschl\u00FCssel existiert nicht. Bitte fordern Sie einen neuen an.
remote.login.title=Loginformular in externe Webseite/CMS einbinden
diff --git a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
index 72bede20aef..00ab19974a1 100644
--- a/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/registration/_i18n/LocalStrings_en.properties
@@ -92,7 +92,7 @@ reg.notiEmail.subject=New OpenOLAT user\: {1} {2} ({0})
reg.subject=Registration key for OpenOLAT
reg.wherefrom=This registration request to the server {0} was made on {1} \nfrom the IP address {2}.
registration.form.cancelled=You have cancelled the registration process.
-registration.pending.notification.mail=Pending user creation notification email
+registration.pending.notification.mail=Pending user creation notification mail
registration.pending.prop.name1=User property name 1
registration.pending.prop.name2=User property name 2
registration.pending.prop.name3=User property name 3
diff --git a/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java b/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
index b80f7bc88ca..b0ea828bb96 100644
--- a/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
+++ b/src/main/java/org/olat/user/ui/admin/UserSearchTableController.java
@@ -389,10 +389,13 @@ public class UserSearchTableController extends FormBasicController {
if (userBulkChanges.isValidChange()) {
Map<String, String> attributeChangeMap = userBulkChanges.getAttributeChangeMap();
Map<OrganisationRoles, String> roleChangeMap = userBulkChanges.getRoleChangeMap();
+ userBulkChanges.getStatus();
List<Long> ownGroups = userBulkChanges.getOwnerGroups();
List<Long> partGroups = userBulkChanges.getParticipantGroups();
List<String> notUpdatedIdentities = new ArrayList<>();
- if (!attributeChangeMap.isEmpty() || !roleChangeMap.isEmpty() || !ownGroups.isEmpty() || !partGroups.isEmpty()){
+ if (!attributeChangeMap.isEmpty() || !roleChangeMap.isEmpty()
+ || !ownGroups.isEmpty() || !partGroups.isEmpty()
+ || userBulkChanges.getStatus() != null){
Identity addingIdentity = ureq1.getIdentity();
userBulkChangesManager.changeSelectedIdentities(identities, userBulkChanges, notUpdatedIdentities,
isAdministrativeUser, getTranslator(), addingIdentity);
@@ -434,6 +437,8 @@ public class UserSearchTableController extends FormBasicController {
} else {
showInfo("bulkChange.success");
}
+ // reload the data
+ tableEl.reset(true, true, true);
}
private List<Identity> getSelectedIdentitiesWithWarning() {
--
GitLab