🔥 Remove possibility to fetch a custom edition

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
index be0e4c1..b93d09a 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
@@ -21,11 +21,6 @@ class RescuePage @Inject constructor(webInterface: WebInterface, loaders: Loader
                val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)
                templateContext["soneRescuer"] = soneRescuer
                if (soneRequest.isPOST) {
                val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)
                templateContext["soneRescuer"] = soneRescuer
                if (soneRequest.isPOST) {

-                       soneRequest.parameters["edition", 9]?.toIntOrNull()?.also {
-                               if (it > -1) {
-                                       soneRescuer.setEdition(it.toLong())
-                               }
-                       }

                        if (soneRequest.parameters["fetch", 8] == "true") {
                                soneRescuer.startNextFetch()
                        }
                        if (soneRequest.parameters["fetch", 8] == "true") {
                                soneRescuer.startNextFetch()
                        }

diff --git a/src/main/resources/templates/rescue.html b/src/main/resources/templates/rescue.html
index e08edc3..d711881 100644 (file)
--- a/src/main/resources/templates/rescue.html
+++ b/src/main/resources/templates/rescue.html
@@ -16,9 +16,10 @@
                <%/if>
                <form action="rescue.html" method="post">
                        <input type="hidden" name="formPassword" value="<%formPassword|html>" />
                <%/if>
                <form action="rescue.html" method="post">
                        <input type="hidden" name="formPassword" value="<%formPassword|html>" />

-                       <label><%= Page.Rescue.Label.NextEdition|l10n|html></label>
-                       <input type="field" name="edition" value="<%soneRescuer.nextEdition>" />
-                       <button type="submit" name="fetch" value="true"><%= Page.Rescue.Button.Fetch|l10n|html></button>
+                       <div>
+                               <%= Page.Rescue.Label.NextEdition|l10n|html>: <%soneRescuer.nextEdition>
+                               <button type="submit" name="fetch" value="true"><%= Page.Rescue.Button.Fetch|l10n|html></button>
+                       </div>

                </form>
        <%else>
                <%if soneRescuer.lastFetchSuccessful>
                </form>
        <%else>
                <%if soneRescuer.lastFetchSuccessful>

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
index d11352f..85e1f6b 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@ -54,33 +54,10 @@ class RescuePageTest : WebPageTest(::RescuePage) {
        }
 
        @Test
        }
 
        @Test

-       fun `post request with fetch and invalid edition starts next fetch`() {
+       fun `post request with fetch starts next fetch`() {

                setMethod(POST)
                addHttpRequestPart("fetch", "true")
                verifyRedirect("rescue.html") {
                setMethod(POST)
                addHttpRequestPart("fetch", "true")
                verifyRedirect("rescue.html") {

-                       verify(soneRescuer, never()).setEdition(anyLong())
-                       verify(soneRescuer).startNextFetch()
-               }
-       }
-
-       @Test
-       fun `post request with fetch and valid edition sets edition and starts next fetch`() {
-               setMethod(POST)
-               addHttpRequestPart("fetch", "true")
-               addHttpRequestPart("edition", "123")
-               verifyRedirect("rescue.html") {
-                       verify(soneRescuer).setEdition(123L)
-                       verify(soneRescuer).startNextFetch()
-               }
-       }
-
-       @Test
-       fun `post request with negative edition will not set edition`() {
-               setMethod(POST)
-               addHttpRequestPart("fetch", "true")
-               addHttpRequestPart("edition", "-123")
-               verifyRedirect("rescue.html") {
-                       verify(soneRescuer, never()).setEdition(anyLong())

                        verify(soneRescuer).startNextFetch()
                }
        }
                        verify(soneRescuer).startNextFetch()
                }
        }