From 32ff3ef0858b1214a96c88f08c67dd43c56ecdb5 Mon Sep 17 00:00:00 2001 From: Pius Uzamere Date: Fri, 4 Dec 2009 09:59:22 -0500 Subject: [PATCH] proper ChoicesController#show method --- app/controllers/choices_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/choices_controller.rb b/app/controllers/choices_controller.rb index c7f0245..3805bc8 100644 --- a/app/controllers/choices_controller.rb +++ b/app/controllers/choices_controller.rb @@ -23,12 +23,10 @@ class ChoicesController < InheritedResources::Base end def show - @question = Question.find(params[:question_id]) - @prompt = @question.prompts.find(params[:id]) show! do |format| - format.xml { render :xml => @prompt.to_xml(:methods => [:left_choice_text, :right_choice_text])} - format.json { render :json => @prompt.to_json(:methods => [:left_choice_text, :right_choice_text])} - end + format.xml { render :xml => @choice.to_xml(:methods => [:data, :votes_count, :wins_plus_losses])} + format.json { render :json => @choice.to_json(:methods => [:data])} + end end def single -- libgit2 0.21.2