From dd154be09e4ba14ba0e697f0995ec135c4088e75 Mon Sep 17 00:00:00 2001
From: boastful-squirrel <boastful.squirrel@gmail.com>
Date: Fri, 16 Aug 2019 20:42:37 +0200
Subject: Do not 'back to listing' link when random route is set

---
 src/file_upload.rs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/file_upload.rs')

diff --git a/src/file_upload.rs b/src/file_upload.rs
index 3ef3a7e..fe65f24 100644
--- a/src/file_upload.rs
+++ b/src/file_upload.rs
@@ -120,6 +120,7 @@ fn handle_multipart(
 pub fn upload_file(
     req: &HttpRequest<crate::MiniserveConfig>,
     default_color_scheme: ColorScheme,
+    uses_random_route: bool
 ) -> FutureResponse<HttpResponse> {
     let return_path = if let Some(header) = req.headers().get(header::REFERER) {
         header.to_str().unwrap_or("/").to_owned()
@@ -146,6 +147,7 @@ pub fn upload_file(
                 query_params.order,
                 color_scheme,
                 default_color_scheme,
+                uses_random_route
             ));
         }
     };
@@ -165,6 +167,7 @@ pub fn upload_file(
                 query_params.order,
                 color_scheme,
                 default_color_scheme,
+                uses_random_route
             ));
         }
     };
@@ -184,6 +187,7 @@ pub fn upload_file(
                 query_params.order,
                 color_scheme,
                 default_color_scheme,
+                uses_random_route
             ));
         }
     };
@@ -208,6 +212,7 @@ pub fn upload_file(
                     query_params.order,
                     color_scheme,
                     default_color_scheme,
+                    uses_random_route
                 ),
             }),
     )
@@ -222,6 +227,7 @@ fn create_error_response(
     sorting_order: Option<SortingOrder>,
     color_scheme: ColorScheme,
     default_color_scheme: ColorScheme,
+    uses_random_route: bool
 ) -> FutureResult<HttpResponse, actix_web::error::Error> {
     errors::log_error_chain(description.to_string());
     future::ok(
@@ -237,7 +243,7 @@ fn create_error_response(
                     color_scheme,
                     default_color_scheme,
                     true,
-                    true,
+                    !uses_random_route,
                 )
                 .into_string(),
             ),
-- 
cgit v1.2.3