Commit 1927f764c16f31f3affdb10965141dc2d815a270
1 parent
d1736d29
Exists in
master
and in
1 other branch
Removing doubly included left and right choice id
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
app/controllers/prompts_controller.rb
| @@ -38,8 +38,8 @@ class PromptsController < InheritedResources::Base | @@ -38,8 +38,8 @@ class PromptsController < InheritedResources::Base | ||
| 38 | 38 | ||
| 39 | respond_to do |format| | 39 | respond_to do |format| |
| 40 | if !successful.nil? | 40 | if !successful.nil? |
| 41 | - format.xml { render :xml => object.to_xml(:procs => optional_information , :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok } | ||
| 42 | - format.json { render :json => object.to_json(:procs => optional_information, :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok } | 41 | + format.xml { render :xml => object.to_xml(:procs => optional_information , :methods => [:left_choice_text, :right_choice_text]), :status => :ok } |
| 42 | + format.json { render :json => object.to_json(:procs => optional_information, :methods => [:left_choice_text, :right_choice_text]), :status => :ok } | ||
| 43 | else | 43 | else |
| 44 | format.xml { render :xml => @prompt.to_xml, :status => :unprocessable_entity } | 44 | format.xml { render :xml => @prompt.to_xml, :status => :unprocessable_entity } |
| 45 | format.json { render :json => @prompt.to_xml, :status => :unprocessable_entity } | 45 | format.json { render :json => @prompt.to_xml, :status => :unprocessable_entity } |
| @@ -75,8 +75,8 @@ class PromptsController < InheritedResources::Base | @@ -75,8 +75,8 @@ class PromptsController < InheritedResources::Base | ||
| 75 | end | 75 | end |
| 76 | respond_to do |format| | 76 | respond_to do |format| |
| 77 | if !successful.nil? | 77 | if !successful.nil? |
| 78 | - format.xml { render :xml => response.to_xml(:procs => optional_information , :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok } | ||
| 79 | - format.json { render :json => response.to_json(:procs => optional_information, :methods => [:left_choice_text, :right_choice_text, :left_choice_id, :right_choice_id]), :status => :ok } | 78 | + format.xml { render :xml => response.to_xml(:procs => optional_information , :methods => [:left_choice_text, :right_choice_text]), :status => :ok } |
| 79 | + format.json { render :json => response.to_json(:procs => optional_information, :methods => [:left_choice_text, :right_choice_text]), :status => :ok } | ||
| 80 | else | 80 | else |
| 81 | format.xml { render :xml => @prompt.to_xml, :status => :unprocessable_entity } | 81 | format.xml { render :xml => @prompt.to_xml, :status => :unprocessable_entity } |
| 82 | format.json { render :json => @prompt.to_xml, :status => :unprocessable_entity } | 82 | format.json { render :json => @prompt.to_xml, :status => :unprocessable_entity } |