From 2e7fb8e8dc9a14994a5f8f61b383e980c6727fb3 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 20 Jul 2021 17:15:57 +0200 Subject: [PATCH] fixed SEBSERV-220 and SEBSERV-221 --- .../ch/ethz/seb/sebserver/gui/content/ExamFormIndicators.java | 2 +- .../remote/webservice/api/useraccount/DeleteUserAccount.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamFormIndicators.java b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamFormIndicators.java index 6c0b858a..28ac5972 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamFormIndicators.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/content/ExamFormIndicators.java @@ -92,7 +92,7 @@ public class ExamFormIndicators implements TemplateComposer { entityKey.modelId)) .withEmptyMessage(INDICATOR_EMPTY_LIST_MESSAGE) .withMarkup() - .withPaging(5) + .withPaging(100) .hideNavigation() .withColumn(new ColumnDefinition<>( Domain.INDICATOR.ATTR_NAME, diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/useraccount/DeleteUserAccount.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/useraccount/DeleteUserAccount.java index 9914f278..bc1e804b 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/useraccount/DeleteUserAccount.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/remote/webservice/api/useraccount/DeleteUserAccount.java @@ -28,7 +28,7 @@ public class DeleteUserAccount extends RestCall { public DeleteUserAccount() { super(new TypeKey<>( - CallType.ACTIVATION_DEACTIVATE, + CallType.DELETE, EntityType.USER, new TypeReference() { }),