X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FEditAlbumPage.kt;h=4569e9a18157157c64ddabc907b417ac8316cec2;hp=58bbb6716c9f5461d017cbb7095d17c6854583b8;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=6a3f1fede0cda5cd6ed56204aa1dd37a19813cb9

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
index 58bbb67..4569e9a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
@@ -1,33 +1,33 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
-import net.pterodactylus.sone.data.Sone
+import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.data.Album.Modifier.*
 import net.pterodactylus.sone.main.*
-import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.WebInterface
+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.*
 
 /**
  * Page that lets the user edit the name and description of an album.
  */
-class EditAlbumPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders):
-		LoggedInPage("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, loaders) {
+@ToadletPath("editAlbum.html")
+class EditAlbumPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+		LoggedInPage("Page.EditAlbum.Title", webInterface, loaders, templateRenderer) {
 
 	override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
 		if (soneRequest.isPOST) {
-			val album = soneRequest.core.getAlbum(soneRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: throw RedirectException("invalid.html")
-			album.takeUnless { it.sone.isLocal }?.run { throw RedirectException("noPermission.html") }
+			val album = soneRequest.core.getAlbum(soneRequest.httpRequest.getPartAsStringFailsafe("album", 36)) ?: redirectTo("invalid.html")
+			album.takeUnless { it.sone.isLocal }?.run { redirectTo("noPermission.html") }
 			if (soneRequest.httpRequest.getPartAsStringFailsafe("moveLeft", 4) == "true") {
 				album.parent?.moveAlbumUp(album)
 				soneRequest.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
+				redirectTo("imageBrowser.html?album=${album.parent?.id}")
 			} else if (soneRequest.httpRequest.getPartAsStringFailsafe("moveRight", 4) == "true") {
 				album.parent?.moveAlbumDown(album)
 				soneRequest.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.parent?.id}")
+				redirectTo("imageBrowser.html?album=${album.parent?.id}")
 			} else {
 				try {
 					album.modify()
@@ -35,10 +35,10 @@ class EditAlbumPage @Inject constructor(template: Template, webInterface: WebInt
 							.setDescription(soneRequest.httpRequest.getPartAsStringFailsafe("description", 1000))
 							.update()
 				} catch (e: AlbumTitleMustNotBeEmpty) {
-					throw RedirectException("emptyAlbumTitle.html")
+					redirectTo("emptyAlbumTitle.html")
 				}
 				soneRequest.core.touchConfiguration()
-				throw RedirectException("imageBrowser.html?album=${album.id}")
+				redirectTo("imageBrowser.html?album=${album.id}")
 			}
 		}
 	}