DMC/scipro
7
0
Fork 0
Code Issues41 Pull Requests8 Actions Projects1 Releases Wiki Activity

3181 Kan inte ta bort systemmeddelande

Browse Source
This commit is contained in:
Wayne Westmoreland 2023-09-12 17:09:54 +02:00
parent 2fbd644221
commit 23f497e88d
1 changed files with 6 additions and 4 deletions

10
view/src/main/java/se/su/dsv/scipro/admin/pages/SystemMaintenancePage.java

@ -29,7 +29,6 @@ import se.su.dsv.scipro.workerthreads.WorkerDataService;
import javax.inject.Inject;
import java.time.Duration;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@ -126,7 +125,7 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage {
private static class SystemNoticeForm extends Form<Void> {
private IModel<String> noticeModel = Model.of(getApplication().getMetaData(SystemNoticePanel.SYSTEM_NOTICE));
private final IModel<String> noticeModel = Model.of(getApplication().getMetaData(SystemNoticePanel.SYSTEM_NOTICE));
public SystemNoticeForm(String id) {
super(id);
@ -135,8 +134,11 @@ public class SystemMaintenancePage extends AbstractAdminSystemPage {
@Override
protected void onSubmit() {
getApplication().setMetaData(SystemNoticePanel.SYSTEM_NOTICE,
Objects.requireNonNullElse(noticeModel.getObject(), ""));
if (noticeModel.getObject() == null) {
getApplication().setMetaData(SystemNoticePanel.SYSTEM_NOTICE, "");
} else {
getApplication().setMetaData(SystemNoticePanel.SYSTEM_NOTICE, noticeModel.getObject());
}
}
}
}