Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

return json with puppies index and show

  • Loading branch information...
commit 15131ea8d9ba040e3292010f152ad59a3d7413a6 1 parent cf3717e
Jeff Morgan authored September 19, 2012

Showing 1 changed file with 2 additions and 0 deletions. Show diff stats Hide diff stats

  1. 2  app/controllers/puppies_controller.rb
2  app/controllers/puppies_controller.rb
@@ -6,6 +6,7 @@ def index
6 6
 
7 7
     respond_to do |format|
8 8
       format.html # index.html.erb
  9
+      format.json { render :json => @puppies }
9 10
     end
10 11
   end
11 12
 
@@ -14,6 +15,7 @@ def show
14 15
 
15 16
     respond_to do |format|
16 17
       format.html # show.html.erb
  18
+      format.json { render :json => @puppy }
17 19
     end
18 20
   end
19 21
 

0 notes on commit 15131ea

Please sign in to comment.
Something went wrong with that request. Please try again.