X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FOptionsPage.kt;h=2c454e82d4a1d9e6aa08cdcdba54b958be311581;hp=c17cbe281f95cd54e23f81c4464bf7d2e8c6f638;hb=aaf780d3c2a6f5ce47295786f3963c8b93f6a145;hpb=87482530f0361af55a17780981d6819269aada67

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
index c17cbe2..2c454e8 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
@@ -1,23 +1,22 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.core.Preferences
-import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent
-import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired
-import net.pterodactylus.sone.utils.emptyToNull
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.utils.parameters
-import net.pterodactylus.sone.web.WebInterface
+import net.pterodactylus.sone.data.SoneOptions.*
+import net.pterodactylus.sone.fcp.FcpInterface.*
+import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.utils.*
+import net.pterodactylus.sone.web.*
 import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.template.Template
-import net.pterodactylus.util.template.TemplateContext
-import javax.inject.Inject
+import net.pterodactylus.util.template.*
+import javax.inject.*
 
 /**
  * This page lets the user edit the options of the Sone plugin.
  */
 @MenuName("Options")
-class OptionsPage @Inject constructor(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("options.html", webInterface, template, "Page.Options.Title") {
+@TemplatePath("/templates/options.html")
+@ToadletPath("options.html")
+class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Options.Title") {
 
 	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
 		if (soneRequest.isPOST) {
@@ -67,7 +66,7 @@ class OptionsPage @Inject constructor(template: Template, webInterface: WebInter
 
 			if (fieldsWithErrors.isEmpty()) {
 				soneRequest.core.touchConfiguration()
-				throw RedirectException("options.html")
+				redirectTo("options.html")
 			}
 			templateContext["fieldErrors"] = fieldsWithErrors
 		}