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

Merge pull request #3 from SafeExamBrowser/development

Browse source 
fix typo
This commit is contained in:
Andreas Hefti 2020-05-04 16:06:42 +02:00 committed by GitHub
commit 20fd411e0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/ethz/seb/sebserver/gbl/model/exam/OpenEdxSebRestriction.java
View file

@ -50,7 +50,7 @@ public class OpenEdxSebRestriction {
}
public enum PermissionComponent {
ALWAYS_ALLOW_STUFF("AlwaysAllowStaff"),
ALWAYS_ALLOW_STAFF("AlwaysAllowStaff"),
CHECK_BROWSER_EXAM_KEY("CheckSEBHashBrowserExamKey"),
CHECK_CONFIG_KEY("CheckSEBHashConfigKey"),
CHECK_BROWSER_EXAM_OR_CONFIG_KEY("CheckSEBHashBrowserExamKeyOrConfigKey");
@ -189,7 +189,7 @@ public class OpenEdxSebRestriction {
.collect(Collectors.toList()));
} else {
final Collection<String> defaultPermissions = new ArrayList<>();
defaultPermissions.add(PermissionComponent.ALWAYS_ALLOW_STUFF.key);
defaultPermissions.add(PermissionComponent.ALWAYS_ALLOW_STAFF.key);
if (!sebRestrictionData.configKeys.isEmpty()) {
defaultPermissions.add(PermissionComponent.CHECK_CONFIG_KEY.key);
}

2
src/main/java/ch/ethz/seb/sebserver/webservice/servicelayer/exam/ExamAdminServiceImpl.java
View file

@ -109,7 +109,7 @@ public class ExamAdminServiceImpl implements ExamAdminService {
if (lmsSetup.lmsType == LmsType.OPEN_EDX) {
final List<String> permissions = Arrays.asList(
OpenEdxSebRestriction.PermissionComponent.ALWAYS_ALLOW_STUFF.key,
OpenEdxSebRestriction.PermissionComponent.ALWAYS_ALLOW_STAFF.key,
OpenEdxSebRestriction.PermissionComponent.CHECK_CONFIG_KEY.key);
this.additionalAttributesDAO.saveAdditionalAttribute(

4
src/main/resources/messages.properties
View file

@ -478,8 +478,8 @@ sebserver.exam.form.sebrestriction.whiteListPaths.PROGRESS.tooltip=The progress
sebserver.exam.form.sebrestriction.whiteListPaths.WIKI=Description (Wiki)
sebserver.exam.form.sebrestriction.whiteListPaths.WIKI.tooltip=The wikipedia section of the Open edX course
sebserver.exam.form.sebrestriction.permissions.ALWAYS_ALLOW_STUFF=Stuff Role Always Allowed
sebserver.exam.form.sebrestriction.permissions.ALWAYS_ALLOW_STUFF.tooltip=Set this to always allow none-restricted access for a user that has "stuff" privileges.
sebserver.exam.form.sebrestriction.permissions.ALWAYS_ALLOW_STAFF=Staff Role Always Allowed
sebserver.exam.form.sebrestriction.permissions.ALWAYS_ALLOW_STAFF.tooltip=Set this to always allow none-restricted access for a user that has "staff" privileges.
sebserver.exam.form.sebrestriction.permissions.CHECK_BROWSER_EXAM_KEY=Check Browser-Exam-Key
sebserver.exam.form.sebrestriction.permissions.CHECK_BROWSER_EXAM_KEY.tooltip=Always check received SEB Browser Exam Key with the defined ones for every request.
sebserver.exam.form.sebrestriction.permissions.CHECK_CONFIG_KEY=Check Config-Key