On file "kill", redirect to / rather than to now dysfunctional file page.

diff --git a/src/templates/file_data.tmpl b/src/templates/file_data.tmpl
index adeaa585930c15823e3f8511e7512d78a23e9d2d..f4aa050ede34857361588fe4f932fe1b31bd83d9 100644 (file)
--- a/src/templates/file_data.tmpl
+++ b/src/templates/file_data.tmpl
@@ -133,7 +133,6 @@ td.dangerous > form > input[type=submit], td.dangerous > button { background-col
 <td class="dangerous">
 <button id="unlink_button" onclick="send_update(this)" />delete locally</button>
 <form action="/{{page_names.file_kill}}/{{file.digest.b64}}" method="POST" />
 <td class="dangerous">
 <button id="unlink_button" onclick="send_update(this)" />delete locally</button>
 <form action="/{{page_names.file_kill}}/{{file.digest.b64}}" method="POST" />

-<input type="hidden" name="redir_target" value="{{redir_target}}" />

 <input type="submit" value="KILL" />
 </form>
 </td>
 <input type="submit" value="KILL" />
 </form>
 </td>

diff --git a/src/ytplom/http.py b/src/ytplom/http.py
index 4958b1e4f39cec9ef5d0d119d4c691db1e10794f..0e42e673041ee94a25b65307e45850a2b0c8c791 100644 (file)
--- a/src/ytplom/http.py
+++ b/src/ytplom/http.py
@@ -128,7 +128,7 @@ class _TaskHandler(PlomHttpHandler):
             file.save(conn)
             conn.commit()
             file.ensure_unlinked_if_no_living_owners(conn)
             file.save(conn)
             conn.commit()
             file.ensure_unlinked_if_no_living_owners(conn)

-        self._redirect(Path(self.postvars.first_for('redir_target')))
+        self._redirect(Path('/'))

 
     def _update_file(self) -> None:
         if not (self.server.config.allow_file_edit  # also if whitelist, …
 
     def _update_file(self) -> None:
         if not (self.server.config.allow_file_edit  # also if whitelist, …


@@ -322,10 +322,8 @@ class _TaskHandler(PlomHttpHandler):
         with DbConn() as conn:
             file = VideoFile.get_one(conn, Hash.from_b64(self.path_toks[2]))
         self._send_rendered_template(
         with DbConn() as conn:
             file = VideoFile.get_one(conn, Hash.from_b64(self.path_toks[2]))
         self._send_rendered_template(

-                _NAME_TEMPLATE_FILE_DATA,
-                {'allow_edit': self.server.config.allow_file_edit,
-                 'file': file,
-                 'redir_target': self.path})
+            _NAME_TEMPLATE_FILE_DATA,
+            {'allow_edit': self.server.config.allow_file_edit, 'file': file})

 
     def _send_file_json(self) -> None:
         with DbConn() as conn:
 
     def _send_file_json(self) -> None:
         with DbConn() as conn: