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

SEBSERV-113

Browse source
This commit is contained in:
anhefti 2020-04-09 14:31:41 +02:00
parent f90083465e
commit 200c21165f
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/ch/ethz/seb/sebserver/gui/content/SebSettingsForm.java
View file

@ -94,18 +94,18 @@ public class SebSettingsForm implements TemplateComposer {
final EntityKey entityKey = pageContext.getEntityKey(); final EntityKey entityKey = pageContext.getEntityKey();
final ConfigurationNode configNode = this.restService.getBuilder(GetExamConfigNode.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
.call()
.onError(error -> pageContext.notifyLoadError(EntityType.CONFIGURATION_NODE, error))
.getOrThrow();
final Composite content = widgetFactory.defaultPageLayout( final Composite content = widgetFactory.defaultPageLayout(
pageContext.getParent(), pageContext.getParent(),
TITLE_TEXT_KEY); new LocTextKey(TITLE_TEXT_KEY.name, Utils.truncateText(configNode.name, 30)));
try { try {
final ConfigurationNode configNode = this.restService.getBuilder(GetExamConfigNode.class)
.withURIVariable(API.PARAM_MODEL_ID, entityKey.modelId)
.call()
.onError(error -> pageContext.notifyLoadError(EntityType.CONFIGURATION_NODE, error))
.getOrThrow();
final Configuration configuration = this.restService.getBuilder(GetConfigurations.class) final Configuration configuration = this.restService.getBuilder(GetConfigurations.class)
.withQueryParam(Configuration.FILTER_ATTR_CONFIGURATION_NODE_ID, configNode.getModelId()) .withQueryParam(Configuration.FILTER_ATTR_CONFIGURATION_NODE_ID, configNode.getModelId())
.withQueryParam(Configuration.FILTER_ATTR_FOLLOWUP, Constants.TRUE_STRING) .withQueryParam(Configuration.FILTER_ATTR_FOLLOWUP, Constants.TRUE_STRING)

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

@ -723,7 +723,8 @@ sebserver.examconfig.status.CONSTRUCTION=Under Construction
sebserver.examconfig.status.READY_TO_USE=Ready To Use sebserver.examconfig.status.READY_TO_USE=Ready To Use
sebserver.examconfig.status.IN_USE=In Use sebserver.examconfig.status.IN_USE=In Use
sebserver.examconfig.props.from.title=Exam Configuration Properties sebserver.examconfig.props.from.title=Exam Configuration Settings ({0})
sebserver.examconfig.props.from.title.subtitle=
sebserver.examconfig.props.form.views.general=General sebserver.examconfig.props.form.views.general=General
sebserver.examconfig.props.form.views.user_interface=User Interface sebserver.examconfig.props.form.views.user_interface=User Interface
sebserver.examconfig.props.form.views.browser=Browser sebserver.examconfig.props.form.views.browser=Browser