Skip to content
Snippets Groups Projects
Commit e5b3ab12 authored by srosse's avatar srosse
Browse files

OO-3719: allow bulk change with only status changes, wording

parent cce270c8
No related branches found
No related tags found
No related merge requests found
...@@ -92,7 +92,7 @@ reg.notiEmail.subject=Neuer OpenOLAT-Benutzer\: {1} {2} ({0}) ...@@ -92,7 +92,7 @@ reg.notiEmail.subject=Neuer OpenOLAT-Benutzer\: {1} {2} ({0})
reg.subject=Registrierungsschl\u00FCssel f\u00FCr OpenOLAT reg.subject=Registrierungsschl\u00FCssel f\u00FCr OpenOLAT
reg.wherefrom=Diese Anfrage an den Server {0} wurde am {1} \nvon der IP-Adresse {2} abgeschickt. 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.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.name1=Benutzer-Attributename 1
registration.pending.prop.name2=Benutzer-Attributename 2 registration.pending.prop.name2=Benutzer-Attributename 2
registration.pending.prop.name3=Benutzer-Attributename 3 registration.pending.prop.name3=Benutzer-Attributename 3
...@@ -103,10 +103,10 @@ registration.pending.prop.value2=Benutzer-Attributewert 2 ...@@ -103,10 +103,10 @@ registration.pending.prop.value2=Benutzer-Attributewert 2
registration.pending.prop.value3=Benutzer-Attributewert 3 registration.pending.prop.value3=Benutzer-Attributewert 3
registration.pending.prop.value4=Benutzer-Attributewert 4 registration.pending.prop.value4=Benutzer-Attributewert 4
registration.pending.prop.value5=Benutzer-Attributewert 5 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.active=Active
registration.pending.status.pending=H\u00E4ngig 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.missing=Der Registrierungsschl\u00FCssel fehlt. Fordern Sie bitte einen neuen an.
regkey.missingentry=Dieser Registrierungsschl\u00FCssel existiert nicht. Bitte fordern Sie 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 remote.login.title=Loginformular in externe Webseite/CMS einbinden
......
...@@ -92,7 +92,7 @@ reg.notiEmail.subject=New OpenOLAT user\: {1} {2} ({0}) ...@@ -92,7 +92,7 @@ reg.notiEmail.subject=New OpenOLAT user\: {1} {2} ({0})
reg.subject=Registration key for OpenOLAT reg.subject=Registration key for OpenOLAT
reg.wherefrom=This registration request to the server {0} was made on {1} \nfrom the IP address {2}. 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.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.name1=User property name 1
registration.pending.prop.name2=User property name 2 registration.pending.prop.name2=User property name 2
registration.pending.prop.name3=User property name 3 registration.pending.prop.name3=User property name 3
......
...@@ -389,10 +389,13 @@ public class UserSearchTableController extends FormBasicController { ...@@ -389,10 +389,13 @@ public class UserSearchTableController extends FormBasicController {
if (userBulkChanges.isValidChange()) { if (userBulkChanges.isValidChange()) {
Map<String, String> attributeChangeMap = userBulkChanges.getAttributeChangeMap(); Map<String, String> attributeChangeMap = userBulkChanges.getAttributeChangeMap();
Map<OrganisationRoles, String> roleChangeMap = userBulkChanges.getRoleChangeMap(); Map<OrganisationRoles, String> roleChangeMap = userBulkChanges.getRoleChangeMap();
userBulkChanges.getStatus();
List<Long> ownGroups = userBulkChanges.getOwnerGroups(); List<Long> ownGroups = userBulkChanges.getOwnerGroups();
List<Long> partGroups = userBulkChanges.getParticipantGroups(); List<Long> partGroups = userBulkChanges.getParticipantGroups();
List<String> notUpdatedIdentities = new ArrayList<>(); 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(); Identity addingIdentity = ureq1.getIdentity();
userBulkChangesManager.changeSelectedIdentities(identities, userBulkChanges, notUpdatedIdentities, userBulkChangesManager.changeSelectedIdentities(identities, userBulkChanges, notUpdatedIdentities,
isAdministrativeUser, getTranslator(), addingIdentity); isAdministrativeUser, getTranslator(), addingIdentity);
...@@ -434,6 +437,8 @@ public class UserSearchTableController extends FormBasicController { ...@@ -434,6 +437,8 @@ public class UserSearchTableController extends FormBasicController {
} else { } else {
showInfo("bulkChange.success"); showInfo("bulkChange.success");
} }
// reload the data
tableEl.reset(true, true, true);
} }
private List<Identity> getSelectedIdentitiesWithWarning() { private List<Identity> getSelectedIdentitiesWithWarning() {
......
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