Merge pull request #1928 from manyfold3d/fix-deletion-redirects

Don't redirect back to deleted files or models
manyfold3d · Mar 4, 2024 · e6d6f03 · e6d6f03
2 parents aa87b6c + cf22ebf
commit e6d6f03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/controllers/model_files_controller.rb b/app/controllers/model_files_controller.rb
@@ -51,7 +51,12 @@ def bulk_update
   def destroy
     authorize @file
     @file.delete_from_disk_and_destroy
-    redirect_back_or_to library_model_path(@library, @model), notice: t(".success")
+    if URI.parse(request.referer).path == library_model_model_file_path(@library, @model, @file)
+      # If we're coming from the file page itself, we can't go back there
+      redirect_to library_model_path(@library, @model), notice: t(".success")
+    else
+      redirect_back_or_to library_model_path(@library, @model), notice: t(".success")
+    end
   end
 
   private

diff --git a/app/controllers/models_controller.rb b/app/controllers/models_controller.rb
@@ -100,7 +100,12 @@ def bulk_update
   def destroy
     authorize @model
     @model.delete_from_disk_and_destroy
-    redirect_back_or_to library_path(@library), notice: t(".success")
+    if URI.parse(request.referer).path == library_model_path(@library, @model)
+      # If we're coming from the model page itself, we can't go back there
+      redirect_to library_path(@library), notice: t(".success")
+    else
+      redirect_back_or_to library_path(@library), notice: t(".success")
+    end
   end
 
   private