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 be4f34b7d9410881b39798310f2c1c2e17be5bda..ad014c705e48d658bdd419a50efe7c731e6b7538 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 72bede20aefc26998e3624292040017cbf9980f5..00ab19974a19af697d60c12355704cfd44dd4623 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 b80f7bc88ca70a9087a2399f253f5d00577adaa0..b0ea828bb968fa0515b6e0784b0ce528332c0645 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() {