From 73fd8fc506afcee46bad2a170405186b63983a4b Mon Sep 17 00:00:00 2001 From: JT Smith Date: Wed, 3 Nov 2004 18:26:02 +0000 Subject: [PATCH] more admin console changes --- lib/WebGUI/AdminConsole.pm | 13 +++---- lib/WebGUI/Operation/ActiveSessions.pm | 4 +- lib/WebGUI/Operation/Clipboard.pm | 3 +- lib/WebGUI/Operation/DatabaseLink.pm | 3 +- lib/WebGUI/Operation/Group.pm | 3 +- lib/WebGUI/Operation/Help.pm | 9 ++--- lib/WebGUI/Operation/LoginHistory.pm | 4 +- lib/WebGUI/Operation/MetaData.pm | 3 +- lib/WebGUI/Operation/Navigation.pm | 3 +- lib/WebGUI/Operation/ProfileSettings.pm | 3 +- lib/WebGUI/Operation/Replacements.pm | 3 +- lib/WebGUI/Operation/Settings.pm | 5 +-- lib/WebGUI/Operation/Statistics.pm | 3 +- lib/WebGUI/Operation/Template.pm | 3 +- lib/WebGUI/Operation/Theme.pm | 3 +- lib/WebGUI/Operation/Trash.pm | 3 +- lib/WebGUI/Operation/User.pm | 3 +- lib/WebGUI/Wobject.pm | 49 +++++++++++++------------ lib/WebGUI/Wobject/DataForm.pm | 16 ++------ lib/WebGUI/Wobject/MessageBoard.pm | 3 +- lib/WebGUI/Wobject/Product.pm | 40 +++++--------------- lib/WebGUI/Wobject/Survey.pm | 15 +++----- 22 files changed, 70 insertions(+), 124 deletions(-) diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 560a0fd20..d445f8f2f 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -208,7 +208,10 @@ sub getAdminFunction { sub new { my $class = shift; - bless {}, $class; + my $id = shift; + my %self; + $self{_function} = $class->getAdminFunction($id); + bless \%self, $class; } sub render { @@ -235,17 +238,11 @@ sub render { return WebGUI::Template::process($session{setting}{AdminConsoleTemplate}, "AdminConsole", \%var); } -sub setAdminFunction { - my $self = shift; - my $id = shift; - $self->{_function} = $self->getAdminFunction($id); -} - sub setHelp { my $self = shift; my $id = shift; my $namespace = shift || "WebGUI"; - $self->{_helpUrl} = WebGUI::URL::page('op=viewHelp&hid='.$id.'&namespace='.$namespace) + $self->{_helpUrl} = WebGUI::URL::page('op=viewHelp&hid='.$id.'&namespace='.$namespace) if ($id); } 1; diff --git a/lib/WebGUI/Operation/ActiveSessions.pm b/lib/WebGUI/Operation/ActiveSessions.pm index badf1db7c..2e628ca55 100644 --- a/lib/WebGUI/Operation/ActiveSessions.pm +++ b/lib/WebGUI/Operation/ActiveSessions.pm @@ -58,9 +58,7 @@ sub www_viewActiveSessions { $output .= $p->getPage($session{form}{pn}); $output .= ''; $output .= $p->getBarTraditional($session{form}{pn}); - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("activeSessions"); - return $ac->render($output); + return WebGUI::AdminConsole->new("activeSessions")->render($output); } 1; diff --git a/lib/WebGUI/Operation/Clipboard.pm b/lib/WebGUI/Operation/Clipboard.pm index 539cf936f..a05eee999 100644 --- a/lib/WebGUI/Operation/Clipboard.pm +++ b/lib/WebGUI/Operation/Clipboard.pm @@ -33,11 +33,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("clipboard"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("clipboard"); $ac->addSubmenuItem(WebGUI::URL::page('op=manageClipboard'), WebGUI::International::get(949)); if ($session{form}{systemClipboard} ne "1") { $ac->addSubmenuItem(WebGUI::URL::page('op=emptyClipboard'), WebGUI::International::get(950)); diff --git a/lib/WebGUI/Operation/DatabaseLink.pm b/lib/WebGUI/Operation/DatabaseLink.pm index eb68364a5..77f99bce2 100644 --- a/lib/WebGUI/Operation/DatabaseLink.pm +++ b/lib/WebGUI/Operation/DatabaseLink.pm @@ -30,11 +30,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("databases"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("databases"); $ac->addSubmenuItem(WebGUI::URL::page('op=editDatabaseLink&dlid=new'), WebGUI::International::get(982)); if (($session{form}{op} eq "editDatabaseLink" && $session{form}{dlid} ne "new") || $session{form}{op} eq "deleteDatabaseLink") { $ac->addSubmenuItem(WebGUI::URL::page('op=editDatabaseLink&dlid='.$session{form}{dlid}), WebGUI::International::get(983)); diff --git a/lib/WebGUI/Operation/Group.pm b/lib/WebGUI/Operation/Group.pm index 3053bfd12..bc079f4e0 100644 --- a/lib/WebGUI/Operation/Group.pm +++ b/lib/WebGUI/Operation/Group.pm @@ -44,11 +44,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("groups"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("groups"); if (WebGUI::Grouping::isInGroup(3)) { $ac->addSubmenuItem(WebGUI::URL::page('op=editGroup&gid=new'), WebGUI::International::get(90)); unless ($session{form}{op} eq "listGroups" diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm index a780ef58a..ab05b593d 100644 --- a/lib/WebGUI/Operation/Help.pm +++ b/lib/WebGUI/Operation/Help.pm @@ -47,15 +47,14 @@ sub _seeAlso { #------------------------------------------------------------------- sub www_viewHelp { return WebGUI::Privilege::insufficient() unless (WebGUI::Grouping::isInGroup(12)); - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("help"); + my $ac = WebGUI::AdminConsole->new("help"); my $namespace = $session{form}{namespace} || "WebGUI"; my $help = _get($session{form}{hid},$namespace); - $ac->addSubmenuItem(WebGUI::URL::page('op=viewHelpIndex'),WebGUI::International::get(95)); foreach my $row (@{$help->{related}}) { my $relatedHelp = _get($row->{tag},$row->{namespace}); $ac->addSubmenuItem(_link($row->{tag},$row->{namespace}),WebGUI::International::get($relatedHelp->{title},$row->{namespace})); } + $ac->addSubmenuItem(WebGUI::URL::page('op=viewHelpIndex'),WebGUI::International::get(95)); return $ac->render( WebGUI::Macro::negate(WebGUI::International::get($help->{body},$namespace)), WebGUI::International::get(93).': '.WebGUI::International::get($help->{title},$namespace) @@ -104,9 +103,7 @@ sub www_viewHelpIndex { } } $output .= ''; - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("help"); - return $ac->render($output); + return WebGUI::AdminConsole->new("help")->render($output); } 1; diff --git a/lib/WebGUI/Operation/LoginHistory.pm b/lib/WebGUI/Operation/LoginHistory.pm index 0b01f5046..fe7d16954 100644 --- a/lib/WebGUI/Operation/LoginHistory.pm +++ b/lib/WebGUI/Operation/LoginHistory.pm @@ -48,9 +48,7 @@ sub www_viewLoginHistory { $output .= $p->getPage($session{form}{pn}); $output .= ''; $output .= $p->getBar($session{form}{pn}); - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("loginHistory"); - return $ac->render($output); + return WebGUI::AdminConsole->new("loginHistory")->render($output); } 1; diff --git a/lib/WebGUI/Operation/MetaData.pm b/lib/WebGUI/Operation/MetaData.pm index ba3701450..3e542dfef 100644 --- a/lib/WebGUI/Operation/MetaData.pm +++ b/lib/WebGUI/Operation/MetaData.pm @@ -29,11 +29,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title,"MetaData") if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("contentProfiling"); if ($help) { $ac->setHelp($help,"MetaData"); } - $ac->setAdminFunction("contentProfiling"); if($session{form}{op} ne "manageMetaData") { $ac->addSubmenuItem(WebGUI::URL::page('op=manageMetaData'), WebGUI::International::get('content profiling','MetaData')); } diff --git a/lib/WebGUI/Operation/Navigation.pm b/lib/WebGUI/Operation/Navigation.pm index cdcd6f98c..c193be37b 100644 --- a/lib/WebGUI/Operation/Navigation.pm +++ b/lib/WebGUI/Operation/Navigation.pm @@ -39,11 +39,10 @@ sub _submenu { my $i18n = WebGUI::International->new("Navigation"); $title = $i18n->get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("navigation"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("navigation"); $ac->addSubmenuItem(WebGUI::URL::page('op=editNavigation'),$i18n->get("add new")); if (($session{form}{op} eq "editNavigation" && $session{form}{navigationId} ne "new") || $session{form}{op} eq "deleteNavigationConfirm") { $ac->addSubmenuItem(WebGUI::URL::page('op=editNavigation&identifier='.$session{form}{identifier}), $i18n->get("18")); diff --git a/lib/WebGUI/Operation/ProfileSettings.pm b/lib/WebGUI/Operation/ProfileSettings.pm index 91468e688..9ecb230cf 100644 --- a/lib/WebGUI/Operation/ProfileSettings.pm +++ b/lib/WebGUI/Operation/ProfileSettings.pm @@ -51,11 +51,10 @@ sub _submenu { my $help = shift; my $namespace = shift; $title = WebGUI::International::get($title,$namespace) if ($title); - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("userProfiling"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("userProfiling"); $ac->addSubmenuItem(WebGUI::URL::page("op=editProfileCategory&cid=new"), WebGUI::International::get(490,"WebGUIProfile")); $ac->addSubmenuItem(WebGUI::URL::page("op=editProfileField&fid=new"), WebGUI::International::get(491,"WebGUIProfile")); if ((($session{form}{op} eq "editProfileField" && $session{form}{fid} ne "new") || $session{form}{op} eq "deleteProfileField") && $session{form}{cid} eq "") { diff --git a/lib/WebGUI/Operation/Replacements.pm b/lib/WebGUI/Operation/Replacements.pm index 3a99090da..ade1d02c0 100644 --- a/lib/WebGUI/Operation/Replacements.pm +++ b/lib/WebGUI/Operation/Replacements.pm @@ -26,11 +26,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("contentFilters"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("contentFilters"); $ac->addSubmenuItem(WebGUI::URL::page("op=editReplacement&replacementId=new"), WebGUI::International::get(1047)); $ac->addSubmenuItem(WebGUI::URL::page("op=listReplacements"), WebGUI::International::get("content filters")); return $ac->render($workarea, $title); diff --git a/lib/WebGUI/Operation/Settings.pm b/lib/WebGUI/Operation/Settings.pm index 215e67e08..acfc3348c 100644 --- a/lib/WebGUI/Operation/Settings.pm +++ b/lib/WebGUI/Operation/Settings.pm @@ -263,10 +263,9 @@ sub www_editSettings { $jscript .= ""; $tabform->getTab("auth")->raw($jscript); $tabform->submit(); - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("settings"); + my $ac = WebGUI::AdminConsole->new("settings"); $ac->setHelp("settings"); - return $ac->render($tabform->print); + return $ac->render($tabform->print); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Operation/Statistics.pm b/lib/WebGUI/Operation/Statistics.pm index edce23224..b7200db5f 100644 --- a/lib/WebGUI/Operation/Statistics.pm +++ b/lib/WebGUI/Operation/Statistics.pm @@ -24,8 +24,7 @@ sub _submenu { my $workarea = shift; my $title = shift; $title = WebGUI::International::get($title) if ($title); - my $ac = WebGUI::AdminConsole->new; - $ac->setAdminFunction("statistics"); + my $ac = WebGUI::AdminConsole->new("statistics"); if ($session{setting}{trackPageStatistics}) { $ac->addSubmenuItem( WebGUI::URL::page("op=viewPageReport"), WebGUI::International::get(796)); # $ac->addSubmenuItem( WebGUI::URL::page("op=viewTrafficReport"), WebGUI::International::get(797)); diff --git a/lib/WebGUI/Operation/Template.pm b/lib/WebGUI/Operation/Template.pm index cec754281..78a964eab 100644 --- a/lib/WebGUI/Operation/Template.pm +++ b/lib/WebGUI/Operation/Template.pm @@ -32,11 +32,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("templates"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("templates"); $ac->addSubmenuItem(WebGUI::URL::page('op=editTemplate&tid=new&namespace='.$session{form}{namespace}), WebGUI::International::get(505)); if ($session{form}{op} eq "editTemplate" && ($session{form}{tid} ne "new" || $session{form}{op} ne "deleteTemplateConfirm")) { $ac->addSubmenuItem( diff --git a/lib/WebGUI/Operation/Theme.pm b/lib/WebGUI/Operation/Theme.pm index c9cf2f87d..47e9e468b 100644 --- a/lib/WebGUI/Operation/Theme.pm +++ b/lib/WebGUI/Operation/Theme.pm @@ -50,11 +50,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("themes"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("themes"); $ac->addSubmenuItem(WebGUI::URL::page('op=editTheme&themeId=new'), WebGUI::International::get(901)); $ac->addSubmenuItem(WebGUI::URL::page('op=importTheme'), WebGUI::International::get(924)); unless (isIn($session{form}{op}, qw(deleteThemeConfirm viewTheme listThemes)) || $session{form}{themeId} eq "new") { diff --git a/lib/WebGUI/Operation/Trash.pm b/lib/WebGUI/Operation/Trash.pm index e4d11e860..e83a8d8c5 100644 --- a/lib/WebGUI/Operation/Trash.pm +++ b/lib/WebGUI/Operation/Trash.pm @@ -116,11 +116,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("trash"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("trash"); $ac->addSubmenuItem(WebGUI::URL::page('op=manageTrash'), WebGUI::International::get(10)); if ($session{form}{systemTrash} ne "1") { $ac->addSubmenuItem(WebGUI::URL::page('op=emptyTrash'), WebGUI::International::get(11)); diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 156ddcbbd..023faf76e 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -38,11 +38,10 @@ sub _submenu { my $title = shift; $title = WebGUI::International::get($title) if ($title); my $help = shift; - my $ac = WebGUI::AdminConsole->new; + my $ac = WebGUI::AdminConsole->new("users"); if ($help) { $ac->setHelp($help); } - $ac->setAdminFunction("users"); if (WebGUI::Grouping::isInGroup(3)) { $ac->addSubmenuItem(WebGUI::URL::page("op=addUser"), WebGUI::International::get(169)); unless ($session{form}{op} eq "listUsers" diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm index b2f30f36f..6798aca86 100644 --- a/lib/WebGUI/Wobject.pm +++ b/lib/WebGUI/Wobject.pm @@ -18,6 +18,7 @@ use CGI::Util qw(rearrange); use DBI; use strict qw(subs vars); use Tie::IxHash; +use WebGUI::AdminConsole; use WebGUI::DateTime; use WebGUI::FormProcessor; use WebGUI::Grouping; @@ -81,6 +82,20 @@ sub _getNextSequenceNumber { #------------------------------------------------------------------- +sub adminConsole { + my $self = shift; + my $content = shift; + my $title = shift; + my $helpId = shift; + my $namespace = shift || $self->namespace; + $title = WebGUI::International::get($title,$namespace) if ($title); + my $ac = WebGUI::AdminConsole->new("assets"); + $ac->setHelp($helpId,$namespace); + $ac->render($content,$title); +} + +#------------------------------------------------------------------- + =head2 canEdit ( ) Returns a boolean (0|1) value signifying that the user has the required privileges. @@ -1158,23 +1173,16 @@ Prompts a user to confirm whether they wish to delete this instance. sub www_delete { my $self = shift; - my ($output); - if ($self->canEdit) { - $output = helpIcon("wobject delete"); - $output .= '

'.WebGUI::International::get(42).'

'; - $output .= WebGUI::International::get(43); - $output .= '

'; - $output .= '

'; - $output .= WebGUI::International::get(44); - $output .= ''; - $output .= '    '; - $output .= WebGUI::International::get(45); - $output .= '
'; - return $output; - } else { - return WebGUI::Privilege::insufficient(); - } + return WebGUI::Privilege::insufficient() unless ($self->canEdit); + my $output = WebGUI::International::get(43); + $output .= '

'; + $output .= '

'; + $output .= WebGUI::International::get(44); + $output .= ''; + $output .= '    '; + $output .= WebGUI::International::get(45); + $output .= '
'; + return $self->adminConsole($output,'42',"wobject delete","WebGUI"); } #------------------------------------------------------------------- @@ -1259,7 +1267,6 @@ An id this namespace of the WebGUI international system. This message will be re sub www_edit { my $self = shift; return WebGUI::Privilege::insufficient() unless ($self->canEdit); - $session{page}{useAdminStyle} = 1; my (@p) = @_; my ($properties, $layout, $privileges, $heading, $helpId, $headingId) = rearrange([qw(properties layout privileges heading helpId headingId)], @p); @@ -1436,11 +1443,7 @@ sub www_edit { '

' ); } - my $output; - $output = helpIcon($helpId,$self->get("namespace")) if ($helpId); - $heading = WebGUI::International::get($headingId,$self->get("namespace")) if ($headingId); - $output .= '

'.$heading.'

' if ($heading); - return $output.$f->print; + return $self->adminConsole($f->print,$headingId,$helpId); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/DataForm.pm b/lib/WebGUI/Wobject/DataForm.pm index 46d6a03bd..6c965935e 100644 --- a/lib/WebGUI/Wobject/DataForm.pm +++ b/lib/WebGUI/Wobject/DataForm.pm @@ -632,8 +632,7 @@ sub www_editSave { #------------------------------------------------------------------- sub www_editField { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, %field, $f, %fieldStatus,$tab); + my (%field, $f, %fieldStatus,$tab); tie %field, 'Tie::CPHash'; tie %fieldStatus, 'Tie::IxHash'; @@ -649,8 +648,6 @@ sub www_editField { } $tab = WebGUI::SQL->buildHashRef("select DataForm_tabId,label from DataForm_tab where wobjectId=".quote($_[0]->get("wobjectId"))); $tab->{0} = $_[0]->i18n("no tab"); - $output = helpIcon("data form fields add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(20,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("fid",$session{form}{fid}); @@ -731,8 +728,7 @@ sub www_editField { ); } $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'20',"data form fields add/edit"); } #------------------------------------------------------------------- @@ -769,16 +765,13 @@ sub www_editFieldSave { #------------------------------------------------------------------- sub www_editTab { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, %tab, $f); + my (%tab, $f); tie %tab, 'Tie::CPHash'; $session{form}{tid} = "new" if ($session{form}{tid} eq ""); unless ($session{form}{tid} eq "new") { %tab = WebGUI::SQL->quickHash("select * from DataForm_tab where DataForm_tabId=".quote($session{form}{tid})); } - $output = helpIcon("data form fields add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(20,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("tid",$session{form}{tid}); @@ -805,8 +798,7 @@ sub www_editTab { ); } $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'20',"data form fields add/edit"); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm index 12fff83fe..d5f01f80a 100644 --- a/lib/WebGUI/Wobject/MessageBoard.pm +++ b/lib/WebGUI/Wobject/MessageBoard.pm @@ -170,7 +170,6 @@ sub www_edit { #------------------------------------------------------------------- sub www_editForum { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; my $forumMeta; if ($session{form}{forumId} ne "new") { $forumMeta = WebGUI::SQL->quickHashRef("select title,description from MessageBoard_forums where forumId=".quote($session{form}{forumId})); @@ -214,7 +213,7 @@ sub www_editForum { } $f->submit; - return helpIcon("forum add/edit",$_[0]->get("namespace")).'

'.WebGUI::International::get(77,$_[0]->get("namespace")).'

'.$f->print; + return $_[0]->adminConsole($f->print,'77','forum add/edit'); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/Product.pm b/lib/WebGUI/Wobject/Product.pm index b61d56c38..787a3b2f8 100644 --- a/lib/WebGUI/Wobject/Product.pm +++ b/lib/WebGUI/Wobject/Product.pm @@ -165,10 +165,7 @@ sub purge { #------------------------------------------------------------------- sub www_addAccessory { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, $f, $accessory, @usedAccessories); - $output = helpIcon("product accessory add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(16,$_[0]->get("namespace")).'

'; + my ($f, $accessory, @usedAccessories); $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("func","addAccessorySave"); @@ -180,15 +177,13 @@ sub www_addAccessory { $f->select("accessoryWobjectId",$accessory,WebGUI::International::get(17,$_[0]->get("namespace"))); $f->yesNo("proceed",WebGUI::International::get(18,$_[0]->get("namespace"))); $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print, '16', "product accessory add/edit"); } #------------------------------------------------------------------- sub www_addAccessorySave { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); return "" unless ($session{form}{accessoryWobjectId}); - $session{page}{useAdminStyle} = 1; my ($seq); ($seq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from Product_accessory where wobjectId=".quote($_[0]->get("wobjectId"))); @@ -204,9 +199,7 @@ sub www_addAccessorySave { #------------------------------------------------------------------- sub www_addRelated { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - my ($output, $f, $related, @usedRelated); - $output = helpIcon("product related add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(19,$_[0]->get("namespace")).'

'; + my ($f, $related, @usedRelated); $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("func","addRelatedSave"); @@ -218,8 +211,7 @@ sub www_addRelated { $f->select("relatedWobjectId",$related,WebGUI::International::get(20,$_[0]->get("namespace"))); $f->yesNo("proceed",WebGUI::International::get(21,$_[0]->get("namespace"))); $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole( $f->print, '19',"product related add/edit"); } #------------------------------------------------------------------- @@ -379,11 +371,8 @@ sub www_editSave { #------------------------------------------------------------------- sub www_editBenefit { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, $data, $f, $benefits); + my ($data, $f, $benefits); $data = $_[0]->getCollateral("Product_benefit","Product_benefitId",$session{form}{bid}); - $output = helpIcon("product benefit add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(53,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("bid",$data->{Product_benefitId}); @@ -392,8 +381,7 @@ sub www_editBenefit { $f->combo("benefit",$benefits,WebGUI::International::get(51,$_[0]->get("namespace")),[$data->{benefits}]); $f->yesNo("proceed",WebGUI::International::get(52,$_[0]->get("namespace"))); $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'53',"product benefit add/edit"); } #------------------------------------------------------------------- @@ -415,11 +403,8 @@ sub www_editBenefitSave { #------------------------------------------------------------------- sub www_editFeature { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, $data, $f, $features); + my ($data, $f, $features); $data = $_[0]->getCollateral("Product_feature","Product_featureId",$session{form}{fid}); - $output = helpIcon("product feature add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(22,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("fid",$data->{Product_featureId}); @@ -428,8 +413,7 @@ sub www_editFeature { $f->combo("feature",$features,WebGUI::International::get(23,$_[0]->get("namespace")),[$data->{feature}]); $f->yesNo("proceed",WebGUI::International::get(24,$_[0]->get("namespace"))); $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'22',"product feature add/edit"); } #------------------------------------------------------------------- @@ -451,11 +435,8 @@ sub www_editFeatureSave { #------------------------------------------------------------------- sub www_editSpecification { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, $data, $f, $hashRef); + my ($data, $f, $hashRef); $data = $_[0]->getCollateral("Product_specification","Product_specificationId",$session{form}{sid}); - $output = helpIcon("product specification add/edit",$_[0]->get("namespace")); - $output .= '

'.WebGUI::International::get(25,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); $f->hidden("sid",$data->{Product_specificationId}); @@ -467,8 +448,7 @@ sub www_editSpecification { $f->combo("units",$hashRef,WebGUI::International::get(29,$_[0]->get("namespace")),[$data->{units}]); $f->yesNo("proceed",WebGUI::International::get(28,$_[0]->get("namespace"))); $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'25',"product specification add/edit"); } #------------------------------------------------------------------- diff --git a/lib/WebGUI/Wobject/Survey.pm b/lib/WebGUI/Wobject/Survey.pm index 4fe2b1e54..5cfe09912 100644 --- a/lib/WebGUI/Wobject/Survey.pm +++ b/lib/WebGUI/Wobject/Survey.pm @@ -590,10 +590,8 @@ sub www_editSave { #------------------------------------------------------------------- sub www_editAnswer { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($question, $output, $f, $answer); + my ($question, $f, $answer); $answer = $_[0]->getCollateral("Survey_answer","Survey_answerId",$session{form}{aid}); - $output = '

'.WebGUI::International::get(18,$_[0]->get("namespace")).'

'; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$session{form}{wid}); $f->hidden("func","editAnswerSave"); @@ -639,8 +637,7 @@ sub www_editAnswer { ); } $f->submit; - $output .= $f->print; - return $output; + return $_[0]->adminConsole($f->print,'18'); } #------------------------------------------------------------------- @@ -668,11 +665,9 @@ sub www_editAnswerSave { #------------------------------------------------------------------- sub www_editQuestion { return WebGUI::Privilege::insufficient() unless ($_[0]->canEdit); - $session{page}{useAdminStyle} = 1; - my ($output, $f, $question, $answerFieldType, $sth, %data); + my ($f, $question, $answerFieldType, $sth, %data); tie %data, 'Tie::CPHash'; $question = $_[0]->getCollateral("Survey_question","Survey_questionId",$session{form}{qid}); - $output = '

'.WebGUI::International::get(17,$_[0]->get("namespace")).'

'; $answerFieldType = $question->{answerFieldType} || "radioList"; $f = WebGUI::HTMLForm->new; $f->hidden("wid",$_[0]->get("wobjectId")); @@ -723,7 +718,7 @@ sub www_editQuestion { ); } $f->submit; - $output .= $f->print; + my $output = $f->print; if ($question->{Survey_questionId} ne "new" && $question->{answerFieldType} ne "text") { $output .= '{Survey_questionId}).'">'.WebGUI::International::get(23,$_[0]->get("namespace")).'

'; @@ -742,7 +737,7 @@ sub www_editQuestion { } $sth->finish; } - return $output; + return $_[0]->adminConsole($output,'17'); } #-------------------------------------------------------------------