Skip to content

Commit 7b421ec

Browse files
committed
feature/Redirect user to referrer after snippet deletion
1 parent dfdd72e commit 7b421ec

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

app/controllers/folders_controller.rb

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def delete_alert
1919
@title = 'Delete Folder'
2020
@message = DELETE_CONFIRM_TEXT
2121
@confirm_word = 'DELETE'
22-
@confirm_path = folder_path(@folder)
22+
@confirm_path = folder_path(@folder, redirect_url: folders_path)
2323
@method = :delete
2424

2525
render layout: false, partial: 'shared/alert'
@@ -134,12 +134,4 @@ def require_minimum_folders
134134
def folder_params
135135
params.require(:folder).permit(:name)
136136
end
137-
138-
def search_params
139-
params.permit(:search_term, :page, :per_page)
140-
end
141-
142-
def offset
143-
(search_params[:page].to_i - 1) * search_params[:per_page].to_i
144-
end
145137
end

app/controllers/snippets_controller.rb

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,13 @@ def destroy
178178
format.html do
179179
if @snippet.destroy
180180
flash[:notice] = 'Snippet deleted!'
181-
182-
redirect_to root_path
183181
else
184182
flash[:alert] = 'Unable to delete snippet'
185-
186-
redirect_to root_path
187183
end
184+
185+
redirect_to URI(request.referrer).path
188186
end
187+
189188
format.json do
190189
if @snippet.destroy
191190
render json: { message: 'Snippet deleted!' }
@@ -207,10 +206,6 @@ def set_snippet
207206
end
208207
end
209208

210-
def offset
211-
(search_params[:page].to_i - 1) * search_params[:per_page].to_i
212-
end
213-
214209
def snippet_params
215210
params.require(:snippet).permit(
216211
:description,

0 commit comments

Comments
 (0)