Merge pull request #164 from MyDry/develop

Develop
MYDRY · Nov 15, 2018 · 1c6005c · 1c6005c
2 parents a937dfc + c5c89a6
commit 1c6005c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb
@@ -22,7 +22,7 @@ def create
   end
 
   def destroy
-    @word = Word.find_by(params[:id])
+    @word = Word.find(params[:id])
     @word.destroy
     flash[:success] = "単語を削除しました"
     redirect_to words_path

diff --git a/app/views/words/index.html.erb b/app/views/words/index.html.erb
@@ -9,12 +9,10 @@
       </div>
       <div class="words-index">
         <% @words.each do |word| %>
-          <%= word.id %>.
           <%= word.word %>
           <% if current_user.admin? %>
             <%= link_to "delete", word_path(word), method: :delete, data: {confirm: "You sure?"} %>
-          <% end %>
-          <br>
+          <% end %>　　　
         <% end %>
       </div>
     </div>