Skip to content
Snippets Groups Projects
Commit 4dba9f70 authored by aboeckle's avatar aboeckle
Browse files

OO-4529 Added role check

parent e2925d12
No related branches found
No related tags found
No related merge requests found
...@@ -27,6 +27,7 @@ import java.util.stream.Collectors; ...@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
import org.olat.NewControllerFactory; import org.olat.NewControllerFactory;
import org.olat.admin.user.UserChangePasswordController; import org.olat.admin.user.UserChangePasswordController;
import org.olat.basesecurity.BaseSecurityManager;
import org.olat.basesecurity.BaseSecurityModule; import org.olat.basesecurity.BaseSecurityModule;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component; import org.olat.core.gui.components.Component;
...@@ -53,6 +54,7 @@ import org.olat.core.gui.control.generic.closablewrapper.CloseableModalControlle ...@@ -53,6 +54,7 @@ import org.olat.core.gui.control.generic.closablewrapper.CloseableModalControlle
import org.olat.core.gui.control.generic.dtabs.Activateable2; import org.olat.core.gui.control.generic.dtabs.Activateable2;
import org.olat.core.id.Identity; import org.olat.core.id.Identity;
import org.olat.core.id.OLATResourceable; import org.olat.core.id.OLATResourceable;
import org.olat.core.id.Roles;
import org.olat.core.id.context.BusinessControl; import org.olat.core.id.context.BusinessControl;
import org.olat.core.id.context.BusinessControlFactory; import org.olat.core.id.context.BusinessControlFactory;
import org.olat.core.id.context.ContextEntry; import org.olat.core.id.context.ContextEntry;
...@@ -141,6 +143,8 @@ public class StudentCoursesController extends FormBasicController implements Act ...@@ -141,6 +143,8 @@ public class StudentCoursesController extends FormBasicController implements Act
private AssessmentService assessmentService; private AssessmentService assessmentService;
@Autowired @Autowired
private CoachingModule coachingModule; private CoachingModule coachingModule;
@Autowired
private BaseSecurityManager securityManager;
public StudentCoursesController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel, public StudentCoursesController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel,
StudentStatEntry statEntry, Identity student, int index, int numOfStudents, boolean fullAccess) { StudentStatEntry statEntry, Identity student, int index, int numOfStudents, boolean fullAccess) {
...@@ -167,7 +171,8 @@ public class StudentCoursesController extends FormBasicController implements Act ...@@ -167,7 +171,8 @@ public class StudentCoursesController extends FormBasicController implements Act
homeLink.setIconLeftCSS("o_icon o_icon_home"); homeLink.setIconLeftCSS("o_icon o_icon_home");
flc.getFormItemComponent().put("home", homeLink); flc.getFormItemComponent().put("home", homeLink);
if (coachingModule.isResetPasswordEnabled()) { Roles roles = securityManager.getRoles(student);
if (coachingModule.isResetPasswordEnabled() && !(roles.isAuthor() || roles.isManager() || roles.isAdministrator() || roles.isSystemAdmin() || roles.isPrincipal())) {
resetLink = LinkFactory.createButton("reset.link", flc.getFormItemComponent(), this); resetLink = LinkFactory.createButton("reset.link", flc.getFormItemComponent(), this);
resetLink.setIconLeftCSS("o_icon o_icon_password"); resetLink.setIconLeftCSS("o_icon o_icon_password");
flc.getFormItemComponent().put("reset", resetLink); flc.getFormItemComponent().put("reset", resetLink);
...@@ -433,7 +438,8 @@ public class StudentCoursesController extends FormBasicController implements Act ...@@ -433,7 +438,8 @@ public class StudentCoursesController extends FormBasicController implements Act
userChangePasswordController = new UserChangePasswordController(ureq, getWindowControl(), student);; userChangePasswordController = new UserChangePasswordController(ureq, getWindowControl(), student);;
listenTo(userChangePasswordController); listenTo(userChangePasswordController);
cmc = new CloseableModalController(getWindowControl(), translate("close"), userChangePasswordController.getInitialComponent()); String name = student.getUser().getFirstName() + " " + student.getUser().getLastName();
cmc = new CloseableModalController(getWindowControl(), translate("close"), userChangePasswordController.getInitialComponent(), true, translate("reset.title", name));
cmc.activate(); cmc.activate();
listenTo(cmc); listenTo(cmc);
} }
......
...@@ -48,6 +48,7 @@ search=Suchen ...@@ -48,6 +48,7 @@ search=Suchen
site.title.alt=Coaching site.title.alt=Coaching
site.title=Coaching site.title=Coaching
reset.link=Passwort zur\u00FCcksetzen reset.link=Passwort zur\u00FCcksetzen
reset.title=Passwort zur\u00FCcksetzen f\u00FCr {0}
results=Resultate results=Resultate
student.name=Name student.name=Name
students.details={0} {1}/{2} students.details={0} {1}/{2}
......
...@@ -42,6 +42,7 @@ previous.group=$\:previous ...@@ -42,6 +42,7 @@ previous.group=$\:previous
previous.student=$\:previous previous.student=$\:previous
progress.of={0} of {1} progress.of={0} of {1}
reset.link=Reset password reset.link=Reset password
reset.title=Reset password for {0}
results=Results results=Results
search=Search search=Search
search.form.login=User name search.form.login=User name
......
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