From 1b0aa2174dcec65f15de4a52a54a9c4cbf37a631 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 28 Mar 2005 05:15:48 +0000 Subject: [PATCH] fix for bug 1171569, which really applied to almost every Asset and Wobject in the system --- lib/WebGUI/Asset/Event.pm | 2 +- lib/WebGUI/Asset/File.pm | 1 + lib/WebGUI/Asset/File/Image.pm | 1 + lib/WebGUI/Asset/FilePile.pm | 1 + lib/WebGUI/Asset/Redirect.pm | 1 + lib/WebGUI/Asset/Snippet.pm | 1 + lib/WebGUI/Asset/Template.pm | 2 +- lib/WebGUI/Asset/Wobject/Article.pm | 2 +- lib/WebGUI/Asset/Wobject/DataForm.pm | 2 +- lib/WebGUI/Asset/Wobject/EventsCalendar.pm | 2 +- lib/WebGUI/Asset/Wobject/Folder.pm | 1 + lib/WebGUI/Asset/Wobject/HttpProxy.pm | 2 +- lib/WebGUI/Asset/Wobject/Layout.pm | 1 + lib/WebGUI/Asset/Wobject/MessageBoard.pm | 2 +- lib/WebGUI/Asset/Wobject/Navigation.pm | 2 +- lib/WebGUI/Asset/Wobject/Poll.pm | 2 +- lib/WebGUI/Asset/Wobject/Product.pm | 2 +- lib/WebGUI/Asset/Wobject/SQLReport.pm | 2 +- lib/WebGUI/Asset/Wobject/Survey.pm | 6 +++--- lib/WebGUI/Asset/Wobject/SyndicatedContent.pm | 2 +- lib/WebGUI/Asset/Wobject/WSClient.pm | 2 +- 21 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 6db6e86d9..b8330338c 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -457,7 +457,7 @@ sub www_deleteEventConfirm { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("event add/edit"); + $self->getAdminConsole->setHelp("event add/edit","EventsCalendar"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('13', 'EventsCalendar')); } diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index ea6e4e0d8..40636ad90 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -259,6 +259,7 @@ sub www_edit { -value=>$self->getValue("templateId"), -namespace=>"FileAsset" ); + $self->getAdminConsole->setHelp("file add/edit", "File"); return $self->getAdminConsole->render($tabform->print,"Edit File"); } diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 858c15b80..009872cc8 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -231,6 +231,7 @@ sub www_edit { -namespace=>"ImageAsset", -defaultValue=>"PBtmpl0000000000000088" ); + $self->getAdminConsole->setHelp("image add/edit","Image"); return $self->getAdminConsole->render($tabform->print,WebGUI::International::get("edit image","Image")); } diff --git a/lib/WebGUI/Asset/FilePile.pm b/lib/WebGUI/Asset/FilePile.pm index c66367ff2..6e9cf65b1 100644 --- a/lib/WebGUI/Asset/FilePile.pm +++ b/lib/WebGUI/Asset/FilePile.pm @@ -136,6 +136,7 @@ sub edit { -label=>WebGUI::International::get("upload files", "FilePile"), -value=>$self->getUploadControl ); + $self->getAdminConsole->setHelp("file pile add/edit","FilePile"); return $self->getAdminConsole->render($tabform->print,WebGUI::International::get("add pile", "FilePile")); } diff --git a/lib/WebGUI/Asset/Redirect.pm b/lib/WebGUI/Asset/Redirect.pm index 40aef6ad0..f371eeb45 100644 --- a/lib/WebGUI/Asset/Redirect.pm +++ b/lib/WebGUI/Asset/Redirect.pm @@ -132,6 +132,7 @@ sub getName { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; + $self->getAdminConsole->setHelp("redirect add/edit", "Redirect"); return $self->getAdminConsole->render($self->getEditForm->print,"Edit Redirect"); } diff --git a/lib/WebGUI/Asset/Snippet.pm b/lib/WebGUI/Asset/Snippet.pm index c95c741d1..eff24d1da 100644 --- a/lib/WebGUI/Asset/Snippet.pm +++ b/lib/WebGUI/Asset/Snippet.pm @@ -166,6 +166,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; + $self->getAdminConsole->setHelp("snippet add/edit","Snippet"); return $self->getAdminConsole->render($self->getEditForm->print,"Edit Snippet"); } diff --git a/lib/WebGUI/Asset/Template.pm b/lib/WebGUI/Asset/Template.pm index 152312789..27e7c5c5d 100644 --- a/lib/WebGUI/Asset/Template.pm +++ b/lib/WebGUI/Asset/Template.pm @@ -333,7 +333,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("template add/edit"); + $self->getAdminConsole->setHelp("template add/edit","Template"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('edit template', 'Template')); } diff --git a/lib/WebGUI/Asset/Wobject/Article.pm b/lib/WebGUI/Asset/Wobject/Article.pm index 5b42df2a0..14bb5c049 100644 --- a/lib/WebGUI/Asset/Wobject/Article.pm +++ b/lib/WebGUI/Asset/Wobject/Article.pm @@ -217,7 +217,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("article add/edit"); + $self->getAdminConsole->setHelp("article add/edit","Article"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Article")); } diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index e6817f673..ea5850da8 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -672,7 +672,7 @@ sub www_deleteTabConfirm { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("data form add/edit"); + $self->getAdminConsole->setHelp("data form add/edit","DataForm"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","DataForm")); } diff --git a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm index 24f58ac74..b3e796d77 100644 --- a/lib/WebGUI/Asset/Wobject/EventsCalendar.pm +++ b/lib/WebGUI/Asset/Wobject/EventsCalendar.pm @@ -528,7 +528,7 @@ sub www_addStyledEvent { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("events calendar add/edit"); + $self->getAdminConsole->setHelp("events calendar add/edit","EventsCalendar"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","EventsCalendar")); } diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index 17ca9bb26..d55a5ac59 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -180,6 +180,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; + $self->getAdminConsole->setHelp("folder add/edit","Folder"); return $self->getAdminConsole->render($self->getEditForm->print,"Edit Folder"); } diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm index 3d8147324..4d39613f5 100644 --- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm +++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm @@ -345,7 +345,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("http proxy add/edit"); + $self->getAdminConsole->setHelp("http proxy add/edit","HttpProxy"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","HttpProxy")); } diff --git a/lib/WebGUI/Asset/Wobject/Layout.pm b/lib/WebGUI/Asset/Wobject/Layout.pm index 62b1f3108..0ab6d5c6d 100644 --- a/lib/WebGUI/Asset/Wobject/Layout.pm +++ b/lib/WebGUI/Asset/Wobject/Layout.pm @@ -200,6 +200,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; + $self->getAdminConsole->setHelp("layout add/edit", "Layout"); return $self->getAdminConsole->render($self->getEditForm->print,"Edit Layout"); } diff --git a/lib/WebGUI/Asset/Wobject/MessageBoard.pm b/lib/WebGUI/Asset/Wobject/MessageBoard.pm index 34c37850d..f05cbd5cc 100644 --- a/lib/WebGUI/Asset/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Asset/Wobject/MessageBoard.pm @@ -128,7 +128,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("message board add/edit"); + $self->getAdminConsole->setHelp("message board add/edit","MessageBoard"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","MessageBoard")); } diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index 07b9bbb0f..88f74ffe8 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -391,7 +391,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("navigation add/edit"); + $self->getAdminConsole->setHelp("navigation add/edit","Navigation"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("22","Navigation")); } diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm index a827de1e2..64bbcaf9b 100644 --- a/lib/WebGUI/Asset/Wobject/Poll.pm +++ b/lib/WebGUI/Asset/Wobject/Poll.pm @@ -354,7 +354,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("poll add/edit"); + $self->getAdminConsole->setHelp("poll add/edit","Poll"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("9","Poll")); } diff --git a/lib/WebGUI/Asset/Wobject/Product.pm b/lib/WebGUI/Asset/Wobject/Product.pm index 700d709b8..e1d8f8b72 100644 --- a/lib/WebGUI/Asset/Wobject/Product.pm +++ b/lib/WebGUI/Asset/Wobject/Product.pm @@ -453,7 +453,7 @@ sub www_deleteSpecificationConfirm { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("product add/edit"); + $self->getAdminConsole->setHelp("product add/edit","Product"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Product")); } diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 866016870..36303ff2e 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -266,7 +266,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("sql report add/edit"); + $self->getAdminConsole->setHelp("sql report add/edit", "SQLReport"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("8","SQLReport")); } diff --git a/lib/WebGUI/Asset/Wobject/Survey.pm b/lib/WebGUI/Asset/Wobject/Survey.pm index 9ff2a2da1..3889f86da 100644 --- a/lib/WebGUI/Asset/Wobject/Survey.pm +++ b/lib/WebGUI/Asset/Wobject/Survey.pm @@ -667,7 +667,7 @@ sub www_deleteAllResponsesConfirm { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("survey add/edit"); + $self->getAdminConsole->setHelp("survey add/edit","Survey"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get(2,'Survey')); } @@ -736,7 +736,7 @@ sub www_editAnswer { } $f->submit; -# $self->getAdminConsole->setHelp("survey add/edit"); +# $self->getAdminConsole->setHelp("answer add/edit","Survey"); return $self->getAdminConsole->render($f->print, WebGUI::International::get(18,'Survey')); } @@ -842,7 +842,7 @@ sub www_editQuestion { $sth->finish; } -# $self->getAdminConsole->setHelp("survey add/edit"); + $self->getAdminConsole->setHelp("question add/edit","Survey"); return $self->getAdminConsole->render($f->print, WebGUI::International::get(17,'Survey')); } diff --git a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm index 185301583..3e02307e4 100644 --- a/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Asset/Wobject/SyndicatedContent.pm @@ -390,7 +390,7 @@ sub view { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("syndicated content add/edit"); + $self->getAdminConsole->setHelp("syndicated content add/edit","SyndicatedContent"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("4","SyndicatedContent")); } diff --git a/lib/WebGUI/Asset/Wobject/WSClient.pm b/lib/WebGUI/Asset/Wobject/WSClient.pm index f0fbd7b6e..92e9dba24 100644 --- a/lib/WebGUI/Asset/Wobject/WSClient.pm +++ b/lib/WebGUI/Asset/Wobject/WSClient.pm @@ -252,7 +252,7 @@ sub getEditForm { sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless $self->canEdit; - $self->getAdminConsole->setHelp("web services client add/edit"); + $self->getAdminConsole->setHelp("web services client add/edit","WSClient"); return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("20","WSClient")); }