Style pages

This commit is contained in:
René Pfeuffer
2019-06-05 11:52:36 +02:00
parent a5c65b4e2c
commit c7875e7f78
4 changed files with 88 additions and 35 deletions

View File

@@ -3,6 +3,8 @@ package sonia.scm.update;
import com.google.inject.servlet.ServletModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sonia.scm.PushStateDispatcher;
import sonia.scm.WebResourceServlet;
class MigrationWizardModule extends ServletModule {
@@ -15,6 +17,8 @@ class MigrationWizardModule extends ServletModule {
LOG.info("= STARTING MIGRATION SERVLET =");
LOG.info("= =");
LOG.info("==========================================================");
bind(PushStateDispatcher.class).toInstance((request, response, uri) -> {});
serve("/images/*", "/styles/*").with(WebResourceServlet.class);
serve("/*").with(MigrationWizardServlet.class);
}
}

View File

@@ -15,6 +15,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -45,6 +46,7 @@ class MigrationWizardServlet extends HttpServlet {
HashMap<String, Object> model = new HashMap<>();
model.put("contextPath", req.getContextPath());
model.put("submitUrl", req.getRequestURI());
model.put("repositories", missingMigrationStrategies);
model.put("strategies", getMigrationStrategies());
@@ -68,7 +70,7 @@ class MigrationWizardServlet extends HttpServlet {
MustacheFactory mf = new DefaultMustacheFactory();
Mustache mustache = mf.compile("templates/repository-migration-restart.mustache");
mustache.execute(resp.getWriter(), new Object()).flush();
mustache.execute(resp.getWriter(), Collections.singletonMap("contextPath", req.getContextPath())).flush();
ScmEventBus.getInstance().post(new RestartEvent(MigrationWizardServlet.class, "wrote migration data"));
}