@@ -29,7 +29,7 @@ def index
2929 end
3030
3131 def popover
32- @snippet = Snippet . find ( params [ :id ] )
32+ @snippet = Snippet . friendly . find ( params [ :id ] )
3333
3434 @popover_options = current_user . popover_options_for ( @snippet )
3535
@@ -38,7 +38,8 @@ def popover
3838
3939 # Does this belong on SnippetFoldersController?
4040 def unfile
41- snippet_folder = current_user . snippet_folders . find_by ( snippet_id : params [ :id ] )
41+ snippet = current_user . filed_snippets . friendly . find ( params [ :id ] )
42+ snippet_folder = current_user . snippet_folders . find_by ( snippet_id : snippet . id )
4243
4344 if snippet_folder && snippet_folder . destroy
4445 flash [ :notice ] = "Snippet removed from collection!"
@@ -55,13 +56,13 @@ def file
5556 format . json do
5657 begin
5758 Snippet . transaction do
58- snippet = Snippet . find ( params [ :id ] )
59+ snippet = Snippet . friendly . find ( params [ :id ] )
5960
60- if snippet_folder = current_user . snippet_folders . find_by ( snippet_id : params [ :id ] )
61+ if snippet_folder = current_user . snippet_folders . find_by ( snippet_id : snippet . id )
6162 snippet_folder . destroy!
6263 end
6364
64- snippet_folder = SnippetFolder . create! ( snippet_id : params [ :id ] , folder_id : params [ :folder_id ] )
65+ snippet_folder = SnippetFolder . create! ( snippet_id : snippet . id , folder_id : params [ :folder_id ] )
6566
6667 unless current_user == snippet . user
6768 snippet_folder . notifications . create! ( user : snippet . user )
@@ -78,7 +79,8 @@ def file
7879 end
7980
8081 def current_folder
81- snippet_folder = current_user . snippet_folders . find_by ( snippet_id : params [ :id ] )
82+ snippet = Snippet . friendly . find ( params [ :id ] )
83+ snippet_folder = current_user . snippet_folders . find_by ( snippet_id : snippet . id )
8284
8385 res = { folders : current_user . folders . map { |folder | FolderSerializer . new ( folder ) . to_h } }
8486
@@ -92,7 +94,7 @@ def current_folder
9294 def show
9395 @page_title = "Snippet"
9496 @languages = Language . all . to_json
95- @snippet = Snippet . includes ( comments : :user ) . find_by ( id : params [ :id ] )
97+ @snippet = Snippet . includes ( comments : :user ) . find_by ( slug : params [ :id ] )
9698
9799 unless @snippet && @snippet . visible_to? ( current_user )
98100 flash [ :alert ] = "You are not authorized to view that snippet"
@@ -148,13 +150,13 @@ def create
148150
149151 #TODO: Use a different controller action for moving a snippet between folders
150152 def update
151- snippet = current_user . filed_snippets . find_by ( id : params [ :id ] )
153+ snippet = current_user . filed_snippets . find_by ( slug : params [ :id ] )
152154
153155 if snippet . update ( snippet_params . except ( :folder_id ) )
154156 folder = current_user . folders . find ( snippet_params [ :folder_id ] )
155157
156158 Snippet . transaction do
157- snippet_folder = current_user . snippet_folders . find_by ( snippet_id : params [ :id ] )
159+ snippet_folder = current_user . snippet_folders . find_by ( snippet_id : snippet . id )
158160
159161 if snippet_folder . folder_id != snippet_params [ :folder_id ] . to_i
160162 snippet_folder . update! ( folder_id : snippet_params [ :folder_id ] )
@@ -179,7 +181,7 @@ def update
179181 end
180182
181183 def destroy
182- @snippet = current_user . snippets . find ( params [ :id ] )
184+ @snippet = current_user . snippets . friendly . find ( params [ :id ] )
183185
184186 if @snippet &.destroy
185187 render json : { resource_id : @snippet . client_id }
0 commit comments