From 20d0630658e1ab50239c631ecab26a8bb637341f Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 12 Oct 2009 21:41:22 -0700
Subject: [PATCH] Fix the Survey Edit icon.  Fixes bug #11122

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 97747ac0e..054bcba87 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - added Insurance estimator for the USPS shipping driver
  - fixed #11121: Syndicated Content search terms require both title and description match
  - fixed #11057: Deleting wiki attachments
+ - fixed #11122: Survey icon is missing from admin console
 
 7.8.1
  - mark $session->datetime->time as deprecated and remove its use from core code
diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm
index 37bbbb0e0..e4fc5a0bb 100644
--- a/lib/WebGUI/Asset/Wobject/Survey.pm
+++ b/lib/WebGUI/Asset/Wobject/Survey.pm
@@ -692,15 +692,18 @@ test suite.
 
 sub getAdminConsole {
     my $self = shift;
-    my $ac = WebGUI::AdminConsole->new( $self->session, 'Survey' );
-    my $i18n = WebGUI::International->new($self->session, "Asset_Survey");
-    $ac->addSubmenuItem($self->session->url->page("func=edit"), WebGUI::International->new($self->session, "WebGUI")->get(575));
-    $ac->addSubmenuItem($self->session->url->page("func=editSurvey"), $i18n->get('edit survey'));
-    $ac->addSubmenuItem($self->session->url->page("func=takeSurvey"), $i18n->get('take survey'));
-    $ac->addSubmenuItem($self->session->url->page("func=graph"), $i18n->get('visualize'));
-    $ac->addSubmenuItem($self->session->url->page("func=editTestSuite"), $i18n->get("test suite"));
-    $ac->addSubmenuItem($self->session->url->page("func=runTests"), $i18n->get("run all tests"));
-    $ac->addSubmenuItem($self->session->url->page("func=runTests;format=tap"), $i18n->get("run all tests") . " (TAP)");
+    my $ac = $self->SUPER::getAdminConsole;
+    unless ($self->{_modifiedAdminConsole}) {
+        my $i18n = WebGUI::International->new($self->session, "Asset_Survey");
+        $ac->addSubmenuItem($self->session->url->page("func=edit"), WebGUI::International->new($self->session, "WebGUI")->get(575));
+        $ac->addSubmenuItem($self->session->url->page("func=editSurvey"), $i18n->get('edit survey'));
+        $ac->addSubmenuItem($self->session->url->page("func=takeSurvey"), $i18n->get('take survey'));
+        $ac->addSubmenuItem($self->session->url->page("func=graph"), $i18n->get('visualize'));
+        $ac->addSubmenuItem($self->session->url->page("func=editTestSuite"), $i18n->get("test suite"));
+        $ac->addSubmenuItem($self->session->url->page("func=runTests"), $i18n->get("run all tests"));
+        $ac->addSubmenuItem($self->session->url->page("func=runTests;format=tap"), $i18n->get("run all tests") . " (TAP)");
+        $self->{_modifiedAdminConsole} = 1;
+    }
     return $ac;
 }
 
diff --git a/t/Asset/Wobject/Survey.t b/t/Asset/Wobject/Survey.t
index 113277888..87f826eb9 100644
--- a/t/Asset/Wobject/Survey.t
+++ b/t/Asset/Wobject/Survey.t
@@ -266,6 +266,7 @@ like($storage->getFileContentsAsScalar($filename), qr{
 
 }
 
+$survey->getAdminConsole();
 my $adminConsole = $survey->getAdminConsole();
 cmp_deeply(
     $adminConsole->{_submenuItem},