Merge pull request #669 from PecanProject/fix_issue_668

Fix citation controller's show method
PecanProject · Aug 10, 2019 · 038dafe · 038dafe
2 parents ad16618 + e55b2cb
commit 038dafe
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/app/controllers/citations_controller.rb b/app/controllers/citations_controller.rb
@@ -123,7 +123,10 @@ def index
   # GET /citations/1
   # GET /citations/1.xml
   def show
-    @citation = Citation.where(:id => params[:id]).includes(params[:include]).first
+    # find_by! throws an ActiveRecord::RecordNotFound exception if no citation
+    # with the given id exists so that we don't attempt to display a nil
+    # citation.
+    @citation = Citation.includes(params[:include]).find_by!(:id => params[:id])
 
     respond_to do |format|
       format.html # show.html.erb