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

fixed browser reload bug

Browse source
This commit is contained in:
anhefti 2019-09-03 16:59:50 +02:00
parent 054dd9d06d
commit ba843df5b5
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/demo/application-demo.properties
View file

@ -16,6 +16,10 @@ spring.datasource.initialization-mode=always
spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
spring.datasource.platform=demo
spring.datasource.hikari.initializationFailTimeout=30000
spring.datasource.hikari.connectionTimeout=30000
spring.datasource.hikari.idleTimeout=600000
spring.datasource.hikari.maxLifetime=1800000
# webservice configuration
sebserver.test.property=This is a SEB Server Demo

5
src/main/java/ch/ethz/seb/sebserver/gui/content/activity/ActivitiesPane.java
View file

@ -358,7 +358,10 @@ public class ActivitiesPane implements TemplateComposer {
navigation.getItems(),
state.activityAnchor());
if (item != null) {
navigation.select(item);
final PageAction action = getActivitySelection(item);
this.pageService.executePageAction(action, result -> {
navigation.select(item);
});
}
}
}

5
src/main/resources/config/application-demo.properties
View file

@ -16,6 +16,11 @@ spring.datasource.initialization-mode=always
spring.datasource.url=jdbc:mariadb://${datastore.mariadb.server.address}:${datastore.mariadb.server.port}/SEBServer?useSSL=false&createDatabaseIfNotExist=true
spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
spring.datasource.platform=demo
spring.datasource.hikari.initializationFailTimeout=30000
spring.datasource.hikari.connectionTimeout=30000
spring.datasource.hikari.idleTimeout=600000
spring.datasource.hikari.maxLifetime=1800000
# webservice configuration
sebserver.webservice.distributed=false