From b5dfa097a4d1bbcd9ac39750018a6235efc14a63 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 31 Mar 2020 13:40:00 +0200 Subject: [PATCH] minor access right fixes --- .../ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java | 2 +- .../ch/ethz/seb/sebserver/gui/content/QuizLookupList.java | 4 +++- src/main/resources/messages.properties | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java index 674dab8f..e6c18655 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ConfigTemplateList.java @@ -44,7 +44,7 @@ import ch.ethz.seb.sebserver.gui.widget.WidgetFactory; public class ConfigTemplateList implements TemplateComposer { private static final LocTextKey NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION = - new LocTextKey("sebserver.examconfig.list.action.no.modify.privilege"); + new LocTextKey("sebserver.configtemplate.list.action.no.modify.privilege"); private static final LocTextKey TITLE_TEMPLATE_TEXT_KEY = new LocTextKey("sebserver.configtemplate.list.title"); private static final LocTextKey EMPTY_TEMPLATE_LIST_TEXT_KEY = diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java index 8c3392b5..b3aefe7c 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/QuizLookupList.java @@ -61,6 +61,8 @@ public class QuizLookupList implements TemplateComposer { // localized text keys + private static final LocTextKey NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION = + new LocTextKey("sebserver.quizdiscovery.list.action.no.modify.privilege"); private static final LocTextKey TITLE_TEXT_KEY = new LocTextKey("sebserver.quizdiscovery.list.title"); private static final LocTextKey EMPTY_LIST_TEXT_KEY = @@ -238,7 +240,7 @@ public class QuizLookupList implements TemplateComposer { .newAction(ActionDefinition.QUIZ_DISCOVERY_EXAM_IMPORT) .withConfirm(importQuizConfirm(table, restService)) .withSelect( - table::getSelection, + table.getGrantedSelection(currentUser, NO_MODIFY_PRIVILEGE_ON_OTHER_INSTITUTION), action -> this.importQuizData(action, table), EMPTY_SELECTION_TEXT) .publishIf(() -> examGrant.im() && table.hasAnyContent(), false); diff --git a/src/main/resources/messages.properties b/src/main/resources/messages.properties index 44ee4010..ccfd086f 100644 --- a/src/main/resources/messages.properties +++ b/src/main/resources/messages.properties @@ -345,6 +345,7 @@ sebserver.quizdiscovery.list.column.starttime.tooltip=The start time of the LMS sebserver.quizdiscovery.list.column.endtime=End Time {0} sebserver.quizdiscovery.list.column.endtime.tooltip=The end time of the LMS exam.

{0} sebserver.quizdiscovery.info.pleaseSelect=Please select first an LMS exam from the list +sebserver.quizdiscovery.list.action.no.modify.privilege=No Access: A LMS exam from other institution cannot be imported. sebserver.quizdiscovery.action.list=LMS Exam Lookup sebserver.quizdiscovery.action.import=Import as Exam @@ -1201,6 +1202,7 @@ sebserver.configtemplate.list.title=Configuration Templates sebserver.configtemplate.list.title.subtitle= sebserver.configtemplate.list.empty=There is currently no SEB-Exam configuration template available. Please create a new one sebserver.configtemplate.list.actions= +sebserver.configtemplate.list.action.no.modify.privilege=No Access: A Configuration Template from other institution cannot be modified. sebserver.configtemplate.info.pleaseSelect=Please select first an Exam Configuration template from the list