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

Merge OpenOLAT 11.3 to OpenOLAT default branch with afaf241a3ed624823879bdf626777159fa4e5918

parents c7d17b3b d1366ea5
No related branches found
No related tags found
No related merge requests found
...@@ -716,7 +716,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate { ...@@ -716,7 +716,7 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
loadModel(ureq, null); loadModel(ureq, null);
} }
private void doEditAssignment(UserRequest ureq, PortfolioElementRow row) { protected void doEditAssignment(UserRequest ureq, PortfolioElementRow row) {
if(editAssignmentCtrl != null) return; if(editAssignmentCtrl != null) return;
Assignment assignment = row.getAssignment(); Assignment assignment = row.getAssignment();
......
...@@ -573,10 +573,14 @@ public class BinderPageListController extends AbstractPageListController { ...@@ -573,10 +573,14 @@ public class BinderPageListController extends AbstractPageListController {
@Override @Override
protected Assignment doStartAssignment(UserRequest ureq, PortfolioElementRow row) { protected Assignment doStartAssignment(UserRequest ureq, PortfolioElementRow row) {
Assignment startedAssigment = super.doStartAssignment(ureq, row); if(secCallback.canInstantiateAssignment()) {
Assignment startedAssigment = super.doStartAssignment(ureq, row);
ThreadLocalUserActivityLogger.log(PortfolioLoggingAction.PORTFOLIO_ASSIGNMENT_STARTED, getClass(), ThreadLocalUserActivityLogger.log(PortfolioLoggingAction.PORTFOLIO_ASSIGNMENT_STARTED, getClass(),
LoggingResourceable.wrap(row.getSection()), LoggingResourceable.wrap(startedAssigment)); LoggingResourceable.wrap(row.getSection()), LoggingResourceable.wrap(startedAssigment));
return startedAssigment; return startedAssigment;
} else if(secCallback.canNewAssignment()) {
doEditAssignment(ureq, row);
}
return null;
} }
} }
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