Skip to content
Snippets Groups Projects
Commit 8f33b27c authored by gnaegi's avatar gnaegi
Browse files

OO-265 add subscription listing to user management environment for better management possibilities

parent c4d9106a
No related branches found
No related tags found
No related merge requests found
...@@ -59,6 +59,7 @@ import org.olat.core.logging.OLATSecurityException; ...@@ -59,6 +59,7 @@ import org.olat.core.logging.OLATSecurityException;
import org.olat.core.util.WebappHelper; import org.olat.core.util.WebappHelper;
import org.olat.core.util.resource.OresHelper; import org.olat.core.util.resource.OresHelper;
import org.olat.core.util.vfs.QuotaManager; import org.olat.core.util.vfs.QuotaManager;
import org.olat.notifications.NotificationUIFactory;
import org.olat.properties.Property; import org.olat.properties.Property;
import org.olat.user.ChangePrefsController; import org.olat.user.ChangePrefsController;
import org.olat.user.DisplayPortraitController; import org.olat.user.DisplayPortraitController;
...@@ -94,6 +95,7 @@ public class UserAdminController extends BasicController implements Activateable ...@@ -94,6 +95,7 @@ public class UserAdminController extends BasicController implements Activateable
private static final String NLS_EDIT_UROLES = "edit.uroles"; private static final String NLS_EDIT_UROLES = "edit.uroles";
private static final String NLS_EDIT_UQUOTA = "edit.uquota"; private static final String NLS_EDIT_UQUOTA = "edit.uquota";
private static final String NLS_VIEW_GROUPS = "view.groups"; private static final String NLS_VIEW_GROUPS = "view.groups";
private static final String NLS_VIEW_SUBSCRIPTIONS = "view.subscriptions";
private VelocityContainer myContent; private VelocityContainer myContent;
...@@ -326,7 +328,14 @@ public class UserAdminController extends BasicController implements Activateable ...@@ -326,7 +328,14 @@ public class UserAdminController extends BasicController implements Activateable
grpCtr = new GroupOverviewController(ureq, getWindowControl(), identity, canStartGroups); grpCtr = new GroupOverviewController(ureq, getWindowControl(), identity, canStartGroups);
listenTo(grpCtr); listenTo(grpCtr);
userTabP.addTab(translate(NLS_VIEW_GROUPS), grpCtr.getInitialComponent()); userTabP.addTab(translate(NLS_VIEW_GROUPS), grpCtr.getInitialComponent());
Boolean canSubscriptions = BaseSecurityModule.USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS;
if (canSubscriptions.booleanValue() || isOlatAdmin) {
Controller subscriptionsCtr = NotificationUIFactory.createSubscriptionListingController(identity, ureq, getWindowControl());
listenTo(subscriptionsCtr); // auto-dispose
userTabP.addTab(translate(NLS_VIEW_SUBSCRIPTIONS), subscriptionsCtr.getInitialComponent());
}
rolesCtr = new SystemRolesAndRightsController(getWindowControl(), ureq, identity); rolesCtr = new SystemRolesAndRightsController(getWindowControl(), ureq, identity);
userTabP.addTab(translate(NLS_EDIT_UROLES), rolesCtr.getInitialComponent()); userTabP.addTab(translate(NLS_EDIT_UROLES), rolesCtr.getInitialComponent());
......
...@@ -133,6 +133,7 @@ title.usersearch=Benutzersuche ...@@ -133,6 +133,7 @@ title.usersearch=Benutzersuche
user.found=Benutzer wurde gefunden user.found=Benutzer wurde gefunden
view.groups=Gruppen view.groups=Gruppen
view.effStatements=Statements view.effStatements=Statements
view.subscriptions=Abonnements
error.search.form.to.short=Suchbegriff ist zu kurz. error.search.form.to.short=Suchbegriff ist zu kurz.
error.search.form.no.wildcard.dublicates=Suchbegriffe mit `**` sind nicht erlaubt. error.search.form.no.wildcard.dublicates=Suchbegriffe mit `**` sind nicht erlaubt.
error.search.form.no.valid.datechooser=Bitte geben Sie ein g\u00fcltiges Datum an. error.search.form.no.valid.datechooser=Bitte geben Sie ein g\u00fcltiges Datum an.
...@@ -136,3 +136,4 @@ title.usersearch=User search ...@@ -136,3 +136,4 @@ title.usersearch=User search
user.found=User was found user.found=User was found
view.effStatements=Statements view.effStatements=Statements
view.groups=Groups view.groups=Groups
view.subscriptions=Subscriptions
...@@ -44,6 +44,7 @@ public class BaseSecurityModule extends AbstractOLATModule { ...@@ -44,6 +44,7 @@ public class BaseSecurityModule extends AbstractOLATModule {
private static final String CONFIG_USERMANAGER_CAN_CREATE_PWD = "sysGroupUsermanager.canCreatePassword"; private static final String CONFIG_USERMANAGER_CAN_CREATE_PWD = "sysGroupUsermanager.canCreatePassword";
private static final String CONFIG_USERMANAGER_CAN_MODIFY_PWD = "sysGroupUsermanager.canModifyPassword"; private static final String CONFIG_USERMANAGER_CAN_MODIFY_PWD = "sysGroupUsermanager.canModifyPassword";
private static final String CONFIG_USERMANAGER_CAN_START_GROUPS = "sysGroupUsermanager.canStartGroups"; private static final String CONFIG_USERMANAGER_CAN_START_GROUPS = "sysGroupUsermanager.canStartGroups";
private static final String CONFIG_USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS = "sysGroupUsermanager.canModifySubscriptions";
private static final String CONFIG_USERMANAGER_ACCESS_TO_QUOTA = "sysGroupUsermanager.accessToQuota"; private static final String CONFIG_USERMANAGER_ACCESS_TO_QUOTA = "sysGroupUsermanager.accessToQuota";
private static final String CONFIG_USERMANAGER_ACCESS_TO_PROP = "sysGroupUsermanager.accessToProperties"; private static final String CONFIG_USERMANAGER_ACCESS_TO_PROP = "sysGroupUsermanager.accessToProperties";
private static final String CONFIG_USERMANAGER_ACCESS_TO_POLICIES = "sysGroupUsermanager.accessToPolicies"; private static final String CONFIG_USERMANAGER_ACCESS_TO_POLICIES = "sysGroupUsermanager.accessToPolicies";
...@@ -63,6 +64,7 @@ public class BaseSecurityModule extends AbstractOLATModule { ...@@ -63,6 +64,7 @@ public class BaseSecurityModule extends AbstractOLATModule {
public static Boolean USERMANAGER_CAN_CREATE_PWD = true; public static Boolean USERMANAGER_CAN_CREATE_PWD = true;
public static Boolean USERMANAGER_CAN_MODIFY_PWD = true; public static Boolean USERMANAGER_CAN_MODIFY_PWD = true;
public static Boolean USERMANAGER_CAN_START_GROUPS = true; public static Boolean USERMANAGER_CAN_START_GROUPS = true;
public static Boolean USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS = true;
public static Boolean USERMANAGER_ACCESS_TO_QUOTA = true; public static Boolean USERMANAGER_ACCESS_TO_QUOTA = true;
public static Boolean USERMANAGER_ACCESS_TO_PROP = false; public static Boolean USERMANAGER_ACCESS_TO_PROP = false;
public static Boolean USERMANAGER_ACCESS_TO_POLICIES = false; public static Boolean USERMANAGER_ACCESS_TO_POLICIES = false;
...@@ -103,6 +105,7 @@ public class BaseSecurityModule extends AbstractOLATModule { ...@@ -103,6 +105,7 @@ public class BaseSecurityModule extends AbstractOLATModule {
USERMANAGER_CAN_CREATE_PWD = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_CREATE_PWD, USERMANAGER_CAN_CREATE_PWD); USERMANAGER_CAN_CREATE_PWD = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_CREATE_PWD, USERMANAGER_CAN_CREATE_PWD);
USERMANAGER_CAN_MODIFY_PWD = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_MODIFY_PWD, USERMANAGER_CAN_MODIFY_PWD); USERMANAGER_CAN_MODIFY_PWD = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_MODIFY_PWD, USERMANAGER_CAN_MODIFY_PWD);
USERMANAGER_CAN_START_GROUPS = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_START_GROUPS, USERMANAGER_CAN_START_GROUPS); USERMANAGER_CAN_START_GROUPS = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_START_GROUPS, USERMANAGER_CAN_START_GROUPS);
USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS = getBooleanConfigParameter(CONFIG_USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS, USERMANAGER_CAN_MODIFY_SUBSCRIPTIONS);
USERMANAGER_ACCESS_TO_QUOTA = getBooleanConfigParameter(CONFIG_USERMANAGER_ACCESS_TO_QUOTA, USERMANAGER_ACCESS_TO_QUOTA); USERMANAGER_ACCESS_TO_QUOTA = getBooleanConfigParameter(CONFIG_USERMANAGER_ACCESS_TO_QUOTA, USERMANAGER_ACCESS_TO_QUOTA);
USERMANAGER_ACCESS_TO_PROP = getBooleanConfigParameter(CONFIG_USERMANAGER_ACCESS_TO_PROP, USERMANAGER_ACCESS_TO_PROP); USERMANAGER_ACCESS_TO_PROP = getBooleanConfigParameter(CONFIG_USERMANAGER_ACCESS_TO_PROP, USERMANAGER_ACCESS_TO_PROP);
......
...@@ -40,6 +40,7 @@ depends-on="database, i18nModule, triggerI18nModuleInit"> ...@@ -40,6 +40,7 @@ depends-on="database, i18nModule, triggerI18nModuleInit">
sysGroupUsermanager.canCreatePassword=true sysGroupUsermanager.canCreatePassword=true
sysGroupUsermanager.canModifyPassword=true sysGroupUsermanager.canModifyPassword=true
sysGroupUsermanager.canStartGroups=true sysGroupUsermanager.canStartGroups=true
sysGroupUsermanager.canModifySubscriptions=true
sysGroupUsermanager.accessToQuota=true sysGroupUsermanager.accessToQuota=true
sysGroupUsermanager.accessToProperties=false sysGroupUsermanager.accessToProperties=false
sysGroupUsermanager.accessToPolicies=false sysGroupUsermanager.accessToPolicies=false
...@@ -82,6 +83,10 @@ depends-on="database, i18nModule, triggerI18nModuleInit"> ...@@ -82,6 +83,10 @@ depends-on="database, i18nModule, triggerI18nModuleInit">
groupmanagers. Groupmanagers can manage course comprehensive groups using the top groupmanagers. Groupmanagers can manage course comprehensive groups using the top
navigation site Groupmanagement. When set to false, the user manager is not allowed navigation site Groupmanagement. When set to false, the user manager is not allowed
to modify any profile information or password from a user that is within such a group. to modify any profile information or password from a user that is within such a group.
- canModifySubscriptions: Allows the user to list all the subscriptions the users has,
launch the corresponding resource and allow the user to delete unwanted subscriptions.
This is e.g. usefull to delete subscriptions where the user has no more access or to
manage users that are inactive at the moment but you do not yet want to delete them.
- canManageAuthors: Allows the user to add a user to the system group authors. Authors - canManageAuthors: Allows the user to add a user to the system group authors. Authors
are allowed to create new learning resources in the learning resources repository. Note are allowed to create new learning resources in the learning resources repository. Note
that beeing added as a co-author to a learning resource grants also the right to create that beeing added as a co-author to a learning resource grants also the right to create
......
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