diff --git a/.gitignore b/.gitignore index 2524dd184..f58d75ea4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.swp /.project /.idea /.bundle @@ -11,4 +12,4 @@ /Gemfile /Gemfile.lock /db/schema.rb -/Gemfile.lock \ No newline at end of file +/Gemfile.lock diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index f6ad48801..20f0b45c4 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -148,7 +148,8 @@ class MemosController < ApplicationController def find_memo return unless find_forum - @memo = @forum.memos.find(params[:id]) + #@memo = @forum.memos.find(params[:id]) + @memo = Memo.find(params[:id]) rescue ActiveRecord::RecordNotFound render_404 nil