From 6b88a8915a95b29217b66bd4721cccf411d5b348 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Fri, 30 Oct 2009 10:13:48 -0700
Subject: [PATCH] Fix bad CSS link in the Edit Survey template.  Fixes bug
 #10984.

Update test to scan for links and srcs in the template body, too.
---
 docs/changelog/7.x.x.txt                      |   1 +
 ...ot_import_survey_default-survey-edit.wgpkg | Bin 0 -> 2025 bytes
 t/rawHrefUrls.t                               |  43 +++++++++++-------
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 docs/upgrades/packages-7.8.3/root_import_survey_default-survey-edit.wgpkg

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index cc3308049..e523f5150 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -28,6 +28,7 @@
  - fixed #11179: user.CanStartThread missing from help
  - fixed #11183: Calendar List View
  - fixed #11135: Tree Navigation menu template shows a drop down fly-out menu
+ - fixed #10984: Edit Survey Screen isn't right in demo
 
 7.8.2
  - Added scheduled vendor payout workflow activity. (Special thanks to Martin @ Oqapi)
diff --git a/docs/upgrades/packages-7.8.3/root_import_survey_default-survey-edit.wgpkg b/docs/upgrades/packages-7.8.3/root_import_survey_default-survey-edit.wgpkg
new file mode 100644
index 0000000000000000000000000000000000000000..bc776e75f71d3ceda3a5bac821ed560db614e39d
GIT binary patch
literal 2025
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
H04M+eVGiZn

literal 0
HcmV?d00001

diff --git a/t/rawHrefUrls.t b/t/rawHrefUrls.t
index 43f4dc428..4d20286b6 100644
--- a/t/rawHrefUrls.t
+++ b/t/rawHrefUrls.t
@@ -26,11 +26,6 @@ use Test::More; # increment this value for each test you create
 my $numTests = 0;
 
 my $session = WebGUI::Test->session;
-my $lib = WebGUI::Test->lib;
-
-##Find the name of the International macro in the user's config file.
-
-#note "International macro name = $international";
 
 ##Regexp setup for parsing out the Macro calls.
 my $macro     = qr{
@@ -43,19 +38,28 @@ my $macro     = qr{
 
 $numTests = $session->db->quickScalar('select count(distinct(assetId)) from template');
 
-plan tests => $numTests;
+plan tests => 2*$numTests;
 
 my $validLinks = 0;
 
+my $nonRootLink = qr{
+    ^
+    \s*                       #Optional whitespace
+    (?: \^ (?: / | Extras))   #Gateway or Extras macro
+    |                         # OR
+    <tmpl_var                 #A template variable
+}x;
+
 sub checkLinks {
     my ($tag, $attrs) = @_;
     if ($tag eq 'link' && $attrs->{href}) {
-        if ($attrs->{href} !~ /\s*\^(?:\/|Extras)/) {
+        diag sprintf '%s: %s', $tag, $attrs->{href};
+        if ($attrs->{href} !~ $nonRootLink) {
             $validLinks = 0;
         }
     }
     elsif ($tag eq 'script' && $attrs->{src}) {
-        if ($attrs->{src} !~ /\s*\^(?:\/|Extras)/) {
+        if ($attrs->{src} !~ $nonRootLink) {
             $validLinks = 0;
         }
     }
@@ -70,15 +74,22 @@ my $parser = HTML::Parser->new(
 my $getATemplate = WebGUI::Asset::Template->getIsa($session);
 
 TEMPLATE: while (my $templateAsset = $getATemplate->()) {
-    my $template = $templateAsset->get('template');
     my $header   = $templateAsset->get('extraHeadTags');
     if(! $header) {
-        ok(1, sprintf "%s: %s (%s) has no rooted link urls", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
-        next TEMPLATE;
+        ok(1, sprintf "%s: %s (%s) has no rooted link urls in the head tags", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
+    }
+    else {
+        $validLinks = 1;
+        $parser->parse($header);
+        ok($validLinks, sprintf "%s: %s (%s) has no rooted link urls in the head tags", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
+    }
+    my $template   = $templateAsset->get('template');
+    if(! $template) {
+        ok(1, sprintf "%s: %s (%s) has no rooted link urls in the template", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
+    }
+    else {
+        $validLinks = 1;
+        $parser->parse($template);
+        ok($validLinks, sprintf "%s: %s (%s) has no rooted link urls in the template", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
     }
-    $validLinks = 1;
-    $parser->parse($header);
-    ok($validLinks, sprintf "%s: %s (%s) has no rooted link urls", $templateAsset->getTitle, $templateAsset->getId, $templateAsset->getUrl);
 }
-
-