Add test for DI constructability of LoginPage

[Sone.git] / src / main / kotlin / net / pterodactylus / sone / web / pages / CreateAlbumPage.kt

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
index ee3936e..2db3148 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
@@ -1,20 +1,22 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
+import net.pterodactylus.sone.data.Sone
 import net.pterodactylus.sone.text.TextFilter
 import net.pterodactylus.sone.utils.isPOST
 import net.pterodactylus.sone.web.WebInterface
 import net.pterodactylus.sone.web.page.FreenetRequest
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * Page that lets the user create a new album.
  */
-class CreateAlbumPage(template: Template, webInterface: WebInterface):
-               SoneTemplatePage("createAlbum.html", template, "Page.CreateAlbum.Title", webInterface, true) {
+class CreateAlbumPage @Inject constructor(template: Template, webInterface: WebInterface):
+               LoggedInPage("createAlbum.html", template, "Page.CreateAlbum.Title", webInterface) {
 
-       override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
+       override fun handleRequest(freenetRequest: FreenetRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (freenetRequest.isPOST) {
                        val name = freenetRequest.httpRequest.getPartAsStringFailsafe("name", 64).trim()
                        if (name.isEmpty()) {
@@ -22,7 +24,6 @@ class CreateAlbumPage(template: Template, webInterface: WebInterface):
                                return
                        }
                        val description = freenetRequest.httpRequest.getPartAsStringFailsafe("description", 256).trim()
-                       val currentSone = webInterface.getCurrentSoneCreatingSession(freenetRequest.toadletContext)
                        val parentId = freenetRequest.httpRequest.getPartAsStringFailsafe("parent", 36)
                        val parent = if (parentId == "") currentSone.rootAlbum else webInterface.core.getAlbum(parentId)
                        val album = webInterface.core.createAlbum(currentSone, parent)