From 272283e75da85ed7e42c175037c115826948d8fe Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Tue, 31 Mar 2009 04:39:48 +0000
Subject: [PATCH] Adding template and js to show warnings.

---
 .../root_import_survey_default-survey-edit.wgpkg | Bin 0 -> 1691 bytes
 lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm    |   1 -
 www/extras/wobject/Survey/editsurvey.js          |   5 +++++
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 docs/upgrades/packages-7.7.2/root_import_survey_default-survey-edit.wgpkg

diff --git a/docs/upgrades/packages-7.7.2/root_import_survey_default-survey-edit.wgpkg b/docs/upgrades/packages-7.7.2/root_import_survey_default-survey-edit.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..7491c9f0267ae838784f03301aef0a29f1459fa9
GIT binary patch
literal 1691
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

literal 0
HcmV?d00001

diff --git a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
index 72277c3f6..6a733d246 100644
--- a/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey/SurveyJSON.pm
@@ -1278,7 +1278,6 @@ sub validateGotoExpression{
     my $goodTargets = shift;
     if($object->{gotoExpression} =~ /\w/ and $object->{gotoExpression} =~ /\s*?(\w*)/){
         my $tar = $1;
-        $self->session->log->error("expre targ was $tar");
         return 0 if(! exists $goodTargets->{$1});
     }
     return 1;
diff --git a/www/extras/wobject/Survey/editsurvey.js b/www/extras/wobject/Survey/editsurvey.js
index efb6df3ae..bad386699 100644
--- a/www/extras/wobject/Survey/editsurvey.js
+++ b/www/extras/wobject/Survey/editsurvey.js
@@ -54,6 +54,11 @@ Survey.Data = (function(){
 
         loadData: function(d){
             focus = d.address;//What is the current highlighted item.
+            var warnings = ""; 
+            for(var w in d.warnings){
+                warnings = warnings + "<br>" + d.warnings[w]; 
+            }
+            document.getElementById('warnings').innerHTML = warnings;
             var showEdit = 1;
             if (lastId.toString() === d.address.toString()) {
                 showEdit = 0;