From 87616b1bb010f24a10509616ee31555bdc342f88 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Thu, 29 Jun 2006 12:44:35 +0000
Subject: [PATCH] fix - Adding Survey Choices

---
 docs/changelog/7.x.x.txt           | 1 +
 lib/WebGUI/Asset/Wobject/Survey.pm | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 1e968d343..7d978b54e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -14,4 +14,5 @@
  - fix: Search displays already deleted files
  - fix: Pagination not working in User Management System
  - fix: Upgrade 6.8.10 to 6.99.5 (Thanks to Erik Svanberg for the patch)
+ - fix: Adding Survey Choices
 
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index b010df057..f84398f78 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -811,7 +811,8 @@ sub www_editAnswer {
         my ($question, $f, $answer);	
         return $self->session->privilege->insufficient() unless ($self->canEdit);
 	my $aid = shift || $self->session->form->process('aid');
-
+	my $qid = shift || $self->session->form->process('qid');
+	
 	my $i18n = WebGUI::International->new($self->session,'Asset_Survey');
 	$answer = $self->getCollateral("Survey_answer","Survey_answerId",$aid);
         $f = WebGUI::HTMLForm->new($self->session,-action=>$self->getUrl);
@@ -825,7 +826,7 @@ sub www_editAnswer {
 	);
         $f->hidden(
 		-name => "qid",
-		-value => $self->session->form->process("qid")
+		-value => $qid
 	);
         $f->hidden(
 		-name => "aid",
@@ -1045,7 +1046,7 @@ sub www_editQuestionSave {
                 },1,0,"Survey_id");
 
         if ($self->session->form->process("proceed") eq "addMultipleChoiceAnswer") {
-                return $self->www_editAnswer('new');
+                return $self->www_editAnswer('new',$qid);
 	} elsif ($self->session->form->process("proceed") eq "addTextAnswer") {
                 $self->setAnswerType("text",$qid);
         	$self->addAnswer(0,$qid);