zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed exam template grants

Browse source
This commit is contained in:
anhefti 2022-05-03 13:56:38 +02:00
parent b63a5f0d44
commit 060e68bb7b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/ch/ethz/seb/sebserver/gui/content/exam/ExamTemplateForm.java
View file

@ -45,6 +45,7 @@ import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.GetIndicator
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.NewExamTemplate;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamTemplate; import ch.ethz.seb.sebserver.gui.service.remote.webservice.api.exam.SaveExamTemplate;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.EntityGrantCheck;
import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.GrantCheck; import ch.ethz.seb.sebserver.gui.service.remote.webservice.auth.CurrentUser.GrantCheck;
import ch.ethz.seb.sebserver.gui.table.ColumnDefinition; import ch.ethz.seb.sebserver.gui.table.ColumnDefinition;
import ch.ethz.seb.sebserver.gui.table.EntityTable; import ch.ethz.seb.sebserver.gui.table.EntityTable;
@ -199,14 +200,13 @@ public class ExamTemplateForm implements TemplateComposer {
.getOr(false); .getOr(false);
final GrantCheck userGrant = currentUser.grantCheck(EntityType.EXAM_TEMPLATE); final GrantCheck userGrant = currentUser.grantCheck(EntityType.EXAM_TEMPLATE);
// final EntityGrantCheck userGrantCheck = currentUser.entityGrantCheck(examTemplate); final EntityGrantCheck userGrantCheck = currentUser.entityGrantCheck(examTemplate);
// final boolean modifyGrant = userGrantCheck.m();
// propagate content actions to action-pane // propagate content actions to action-pane
this.pageService.pageActionBuilder(formContext.clearEntityKeys()) this.pageService.pageActionBuilder(formContext.clearEntityKeys())
.newAction(ActionDefinition.EXAM_TEMPLATE_MODIFY) .newAction(ActionDefinition.EXAM_TEMPLATE_MODIFY)
.withEntityKey(entityKey) .withEntityKey(entityKey)
.publishIf(() -> userGrant.im() && readonly) .publishIf(() -> userGrantCheck.m() && readonly)
.newAction(ActionDefinition.EXAM_TEMPLATE_SAVE) .newAction(ActionDefinition.EXAM_TEMPLATE_SAVE)
.withEntityKey(entityKey) .withEntityKey(entityKey)
@ -223,17 +223,17 @@ public class ExamTemplateForm implements TemplateComposer {
.withEntityKey(entityKey) .withEntityKey(entityKey)
.withConfirm(() -> EXAM_TEMPLATE_DELETE_CONFIRM) .withConfirm(() -> EXAM_TEMPLATE_DELETE_CONFIRM)
.withExec(this::deleteExamTemplate) .withExec(this::deleteExamTemplate)
.publishIf(() -> userGrant.iw() && readonly) .publishIf(() -> userGrantCheck.w() && readonly)
.newAction(ActionDefinition.EXAM_TEMPLATE_PROCTORING_ON) .newAction(ActionDefinition.EXAM_TEMPLATE_PROCTORING_ON)
.withEntityKey(entityKey) .withEntityKey(entityKey)
.withExec(this.proctoringSettingsPopup.settingsFunction(this.pageService, userGrant.im())) .withExec(this.proctoringSettingsPopup.settingsFunction(this.pageService, userGrantCheck.m()))
.noEventPropagation() .noEventPropagation()
.publishIf(() -> proctoringEnabled && readonly) .publishIf(() -> proctoringEnabled && readonly)
.newAction(ActionDefinition.EXAM_TEMPLATE_PROCTORING_OFF) .newAction(ActionDefinition.EXAM_TEMPLATE_PROCTORING_OFF)
.withEntityKey(entityKey) .withEntityKey(entityKey)
.withExec(this.proctoringSettingsPopup.settingsFunction(this.pageService, userGrant.im())) .withExec(this.proctoringSettingsPopup.settingsFunction(this.pageService, userGrantCheck.m()))
.noEventPropagation() .noEventPropagation()
.publishIf(() -> !proctoringEnabled && readonly); .publishIf(() -> !proctoringEnabled && readonly);
@ -275,7 +275,7 @@ public class ExamTemplateForm implements TemplateComposer {
.asMarkup() .asMarkup()
.widthProportion(4)) .widthProportion(4))
.withDefaultActionIf( .withDefaultActionIf(
() -> userGrant.im(), () -> userGrantCheck.m(),
() -> actionBuilder () -> actionBuilder
.newAction(ActionDefinition.INDICATOR_TEMPLATE_MODIFY_FROM_LIST) .newAction(ActionDefinition.INDICATOR_TEMPLATE_MODIFY_FROM_LIST)
.withParentEntityKey(entityKey) .withParentEntityKey(entityKey)
@ -296,7 +296,7 @@ public class ExamTemplateForm implements TemplateComposer {
indicatorTable::getMultiSelection, indicatorTable::getMultiSelection,
PageAction::applySingleSelectionAsEntityKey, PageAction::applySingleSelectionAsEntityKey,
INDICATOR_EMPTY_SELECTION_TEXT_KEY) INDICATOR_EMPTY_SELECTION_TEXT_KEY)
.publishIf(() -> userGrant.im() && indicatorTable.hasAnyContent(), false) .publishIf(() -> userGrantCheck.m() && indicatorTable.hasAnyContent(), false)
.newAction(ActionDefinition.INDICATOR_TEMPLATE_DELETE_FROM_LIST) .newAction(ActionDefinition.INDICATOR_TEMPLATE_DELETE_FROM_LIST)
.withEntityKey(entityKey) .withEntityKey(entityKey)
@ -304,11 +304,11 @@ public class ExamTemplateForm implements TemplateComposer {
indicatorTable::getMultiSelection, indicatorTable::getMultiSelection,
this::deleteSelectedIndicator, this::deleteSelectedIndicator,
INDICATOR_EMPTY_SELECTION_TEXT_KEY) INDICATOR_EMPTY_SELECTION_TEXT_KEY)
.publishIf(() -> userGrant.im() && indicatorTable.hasAnyContent(), false) .publishIf(() -> userGrantCheck.m() && indicatorTable.hasAnyContent(), false)
.newAction(ActionDefinition.INDICATOR_TEMPLATE_NEW) .newAction(ActionDefinition.INDICATOR_TEMPLATE_NEW)
.withParentEntityKey(entityKey) .withParentEntityKey(entityKey)
.publishIf(() -> userGrant.im()); .publishIf(() -> userGrantCheck.m());
} }
} }