fixing layout for api

steveklabnik · steveklabnik · commit 943139952a35 · 2011-08-28T16:45:08.000-04:00
diff --git a/app/controllers/api/rels_controller.rb b/app/controllers/api/rels_controller.rb
@@ -1,4 +1,4 @@
-class Api::RelsController < ApplicationController
+class Api::RelsController < ApiController
   def index
     @rels = Rel.all
   end
diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
@@ -0,0 +1,3 @@
+class ApiController < ApplicationController
+  layout false
+end
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
@@ -1,6 +1,6 @@
 class StaticController < ApplicationController
   def root; end
-  def api_root; end
+  def api_root; render :layout => false; end
   def newest_version
     render :json => {:version => "1.0.0"}
   end

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class Api::RelsController < ApplicationController`
	`1`	`+class Api::RelsController < ApiController`
`2`	`2`	`def index`
`3`	`3`	`@rels = Rel.all`
`4`	`4`	`end`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+class ApiController < ApplicationController`
	`2`	`+ layout false`
	`3`	`+end`