In respond_to blocks, prefer HTML over JSON if the request does not s…

…pecify what it prefers
pombredanne · Sep 5, 2012 · 19f0989 · 19f0989
1 parent b36829c
commit 19f0989
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/controllers/updates_controller.rb b/app/controllers/updates_controller.rb
@@ -7,12 +7,12 @@ def index
     @list_class = "all"
 
     respond_to do |format|
+      format.html { render_index(Update) }
       format.json {
         @updates = Update
         set_pagination
         render :json => @updates.map{ |u| UpdateJsonDecorator.decorate(u) }
       }
-      format.html { render_index(Update) }
     end
 
   end

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -40,10 +40,10 @@ def show
       headers['Link'] = "<#{user_xrd_path(@user.author)}>; rel=\"lrdd\"; type=\"application/xrd+xml\""
 
       respond_to do |format|
+        format.html
         format.json {
           render :json => @updates.map{ |u| UpdateJsonDecorator.decorate(u) }
         }
-        format.html
       end
 
     end