end of test program sweeps for dictionary lookups via subroutine instead

of object method.
This commit is contained in:
Colin Kuskie 2006-01-15 02:34:50 +00:00
parent 26700d9ac0
commit edfaa153b9
16 changed files with 91 additions and 162 deletions

View file

@ -75,9 +75,11 @@ A hash reference passed in from a subclass definition.
sub definition {
my $class = shift;
my $session = shift;
my $definition = shift;
my $i18n = WebGUI::International->new($session,"Asset_File");
push(@{$definition}, {
assetName=>WebGUI::International::get('assetName',"Asset_File"),
assetName=>$i18n->get('assetName'),
tableName=>'FileAsset',
className=>'WebGUI::Asset::File',
properties=>{
@ -97,7 +99,7 @@ sub definition {
}
}
});
return $class->SUPER::definition($definition);
return $class->SUPER::definition($session, $definition);
}
@ -130,17 +132,18 @@ Returns the TabForm object that will be used in generating the edit page for thi
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
my $i18n = WebGUI::International->new($self->session, 'Asset_File');
if ($self->get("filename") ne "") {
$tabform->getTab("properties")->readOnly(
-label=>WebGUI::International::get('current file', 'Asset_File'),
-hoverHelp=>WebGUI::International::get('current file description', 'Asset_File'),
-label=>$i18n->get('current file'),
-hoverHelp=>$i18n->get('current file description', 'Asset_File'),
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
);
}
$tabform->getTab("properties")->file(
-label=>WebGUI::International::get('new file', 'Asset_File'),
-hoverHelp=>WebGUI::International::get('new file description', 'Asset_File'),
-label=>$i18n->get('new file'),
-hoverHelp=>$i18n->get('new file description'),
);
return $tabform;
}
@ -275,14 +278,15 @@ sub view {
sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
my $i18n = WebGUI::International->new($self->session);
my $tabform = $self->getEditForm;
$tabform->getTab("display")->template(
-value=>$self->getValue("templateId"),
-hoverHelp=>WebGUI::International::get('file template description','Asset_File'),
-hoverHelp=>$i18n->get('file template description','Asset_File'),
-namespace=>"FileAsset"
);
$self->getAdminConsole->setHelp("file add/edit", "Asset_File");
my $addEdit = ($self->session->form->process("func") eq 'add') ? WebGUI::International::get('add','Wobject') : WebGUI::International::get('edit','Wobject');
my $addEdit = ($self->session->form->process("func") eq 'add') ? $i18n->get('add','Wobject') : $i18n->get('edit','Wobject');
return $self->getAdminConsole->render($tabform->print,$addEdit.' '.$self->getName);
}

View file

@ -49,6 +49,7 @@ These methods are available from this class:
sub edit {
my $self = shift;
my $tabform = WebGUI::TabForm->new($self->session,);
my $i18n = WebGUI::International->new($self->session, 'Asset_FilePile');
$tabform->hidden({
name=>"func",
value=>"add"
@ -67,33 +68,33 @@ sub edit {
value=>$self->session->form->process("proceed")
});
}
$tabform->addTab("properties",WebGUI::International::get("properties","Asset"));
$tabform->addTab("properties",$i18n->get("properties","Asset"));
$tabform->getTab("properties")->yesNo(
-name=>"isHidden",
-value=>1,
-label=>WebGUI::International::get(886,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('886 description',"Asset_FilePile"),
-label=>$i18n->get(886),
-hoverHelp=>$i18n->get('886 description'),
-uiLevel=>6
);
$tabform->getTab("properties")->yesNo(
-name=>"newWindow",
-value=>0,
-label=>WebGUI::International::get(940,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('940 description',"Asset_FilePile"),
-label=>$i18n->get(940),
-hoverHelp=>$i18n->get('940 description'),
-uiLevel=>6
);
$tabform->addTab("security",WebGUI::International::get(107,"Asset"),6);
$tabform->addTab("security",$i18n->get(107,"Asset"),6);
$tabform->getTab("security")->dateTime(
-name=>"startDate",
-label=>WebGUI::International::get(497,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('497 description',"Asset_FilePile"),
-label=>$i18n->get(497),
-hoverHelp=>$i18n->get('497 description'),
-value=>$self->get("startDate"),
-uiLevel=>6
);
$tabform->getTab("security")->dateTime(
-name=>"endDate",
-label=>WebGUI::International::get(498,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('498 description',"Asset_FilePile"),
-label=>$i18n->get(498),
-hoverHelp=>$i18n->get('498 description'),
-value=>$self->get("endDate"),
-uiLevel=>6
);
@ -115,34 +116,34 @@ sub edit {
$tabform->getTab("security")->selectBox(
-name=>"ownerUserId",
-options=>$users,
-label=>WebGUI::International::get(108,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('108 description',"Asset_FilePile"),
-label=>$i18n->get(108),
-hoverHelp=>$i18n->get('108 description'),
-value=>[$self->get("ownerUserId")],
-subtext=>$subtext,
-uiLevel=>6
);
$tabform->getTab("security")->group(
-name=>"groupIdView",
-label=>WebGUI::International::get(872,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('872 description',"Asset_FilePile"),
-label=>$i18n->get(872),
-hoverHelp=>$i18n->get('872 description'),
-value=>[$self->get("groupIdView")],
-uiLevel=>6
);
$tabform->getTab("security")->group(
-name=>"groupIdEdit",
-label=>WebGUI::International::get(871,"Asset_FilePile"),
-hoverHelp=>WebGUI::International::get('871 description',"Asset_FilePile"),
-label=>$i18n->get(871),
-hoverHelp=>$i18n->get('871 description'),
-value=>[$self->get("groupIdEdit")],
-excludeGroups=>[1,7],
-uiLevel=>6
);
$tabform->getTab("properties")->file(
-label=>WebGUI::International::get("upload files", "Asset_FilePile"),
-hoverHelp=>WebGUI::International::get("upload files description", "Asset_FilePile"),
-label=>$i18n->get("upload files"),
-hoverHelp=>$i18n->get("upload files description"),
-maxAttachments=>100
);
$self->getAdminConsole->setHelp("file pile add/edit","Asset_FilePile");
return $self->getAdminConsole->render($tabform->print,WebGUI::International::get("add pile", "Asset_FilePile"));
return $self->getAdminConsole->render($tabform->print,$i18n->get("add pile"));
}
#-------------------------------------------------------------------
@ -203,7 +204,9 @@ Returns the displayable name of this asset.
=cut
sub getName {
return WebGUI::International::get('assetName',"Asset_FilePile");
my $self = shift;
my $i18n = WebGUI::International->new($self->session);
return $i18n->get('assetName',"Asset_FilePile");
}

View file

@ -56,9 +56,11 @@ A hash reference passed in from a subclass definition.
sub definition {
my $class = shift;
my $session = shift;
my $definition = shift;
my $i18n = WebGUI::International->new($session);
push(@{$definition}, {
assetName=>WebGUI::International::get('assetName',"Asset_Redirect"),
assetName=>$i18n->get('assetName',"Asset_Redirect"),
uiLevel => 9,
icon=>'redirect.gif',
tableName=>'redirect',
@ -86,10 +88,11 @@ Returns the TabForm object that will be used in generating the edit page for thi
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
my $i18n = WebGUI::International->new($self->session, 'Asset_Redirect');
$tabform->getTab("properties")->url(
-name=>"redirectUrl",
-label=>WebGUI::International::get('redirect url', 'Asset_Redirect'),
-hoverHelp=>WebGUI::International::get('redirect url description', 'Asset_Redirect'),
-label=>$i18n->get('redirect url'),
-hoverHelp=>$i18n->get('redirect url description'),
-value=>$self->getValue("redirectUrl")
);
return $tabform;
@ -101,7 +104,8 @@ sub www_edit {
my $self = shift;
return $self->session->privilege->insufficient() unless $self->canEdit;
$self->getAdminConsole->setHelp("redirect add/edit", "Asset_Redirect");
return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('redirect add/edit title', 'Asset_Redirect'));
my $i18n = WebGUI::International->new($self->session, 'Asset_Redirect');
return $self->getAdminConsole->render($self->getEditForm->print,$i18n->get('redirect add/edit title'));
}
#-------------------------------------------------------------------

View file

@ -729,14 +729,6 @@ sub www_deleteTabConfirm {
return "";
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("data form add/edit","Asset_DataForm");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("7","Asset_DataForm"));
#}
#-------------------------------------------------------------------
sub www_editField {
my $self = shift;

View file

@ -454,14 +454,6 @@ sub view {
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("events calendar add/edit","Asset_EventsCalendar");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("12","Asset_EventsCalendar"));
#}
#-------------------------------------------------------------------
=head2 www_view ( )

View file

@ -341,14 +341,6 @@ sub view {
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("http proxy add/edit","Asset_HttpProxy");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("2","Asset_HttpProxy"));
#}
#-------------------------------------------------------------------
sub www_view {

View file

@ -319,14 +319,6 @@ sub view {
return $self->processTemplate(\%var,$self->get("templateId"));
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("poll add/edit","Asset_Poll");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("9","Asset_Poll"));
#}
#-------------------------------------------------------------------
sub www_vote {
my $self = shift;

View file

@ -92,7 +92,6 @@ sub addRevision {
#-------------------------------------------------------------------
sub definition {
my $class = shift;
return $class->SUPER::definition($definition);
my $definition = shift;
my $i18n = WebGUI::International->new($session,"Asset_Product");
push(@{$definition}, {
@ -444,14 +443,6 @@ sub www_deleteSpecificationConfirm {
return "";
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("product add/edit","Asset_Product");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("6","Asset_Product"));
#}
#-------------------------------------------------------------------
sub processPropertiesFromFormPost {
my $self = shift;

View file

@ -252,15 +252,6 @@ sub view {
return $self->processTemplate($var, $self->get("templateId"));
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("sql report add/edit", "Asset_SQLReport");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("8","Asset_SQLReport"));
#}
#-------------------------------------------------------------------
sub _storeQueries {
my $self = shift;

View file

@ -447,21 +447,6 @@ sub www_displayStock {
return $self->processTemplate($var, $self->get("displayTemplateId"));
}
#-------------------------------------------------------------------
#=head2 www_edit ( )
#Web facing method which is the default edit page
#=cut
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("stock list add/edit","Asset_StockData");
# return $self->getAdminConsole->render($self->getEditForm->print,
# WebGUI::International::get("edit_title","Asset_StockData"));
#}
#-------------------------------------------------------------------
=head2 www_view ( )

View file

@ -572,21 +572,6 @@ sub _createRSSURLs{
}
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
#=head2 www_edit()
#Sets parameters and returns a form to edit this wobject.
#=cut
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp('syndicated content add/edit','Asset_SyndicatedContent');
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get('4','Asset_SyndicatedContent'));
#}
#+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
=head2 www_viewRSS090()

View file

@ -216,16 +216,6 @@ sub getEditForm {
return $tabform;
}
#-------------------------------------------------------------------
#sub www_edit {
# my $self = shift;
# return $self->session->privilege->insufficient() unless $self->canEdit;
# $self->getAdminConsole->setHelp("ws client add/edit","Asset_WSClient");
# return $self->getAdminConsole->render($self->getEditForm->print,WebGUI::International::get("20","Asset_WSClient"));
#}
#-------------------------------------------------------------------
sub view {
my ( $arr_ref, # temp var holding params

View file

@ -158,6 +158,7 @@ Returns a rendered page to edit MetaData. Will return an insufficient Privilege
sub www_editMetaDataField {
my $self = shift;
my $i18n = WebGUI::International->new($self->session,'Asset');
my $ac = WebGUI::AdminConsole->new($self->session,"contentProfiling");
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4));
my $fieldInfo;
@ -176,35 +177,35 @@ sub www_editMetaDataField {
);
$f->readOnly(
-value=>$fid,
-label=>WebGUI::International::get('Field Id','Asset'),
-label=>$i18n->get('Field Id'),
);
$f->text(
-name=>"fieldName",
-label=>WebGUI::International::get('Field name','Asset'),
-hoverHelp=>WebGUI::International::get('Field Name description','Asset'),
-label=>$i18n->get('Field name'),
-hoverHelp=>$i18n->get('Field Name description'),
-value=>$fieldInfo->{fieldName}
);
$f->textarea(
-name=>"description",
-label=>WebGUI::International::get(85,"Asset"),
-hoverHelp=>WebGUI::International::get('Metadata Description description',"Asset"),
-label=>$i18n->get(85),
-hoverHelp=>$i18n->get('Metadata Description description'),
-value=>$fieldInfo->{description});
$f->fieldType(
-name=>"fieldType",
-label=>WebGUI::International::get(486,"Asset"),
-hoverHelp=>WebGUI::International::get('Data Type description',"Asset"),
-label=>$i18n->get(486),
-hoverHelp=>$i18n->get('Data Type description'),
-value=>$fieldInfo->{fieldType} || "text",
-types=> [ qw /text integer yesNo selectList radioList/ ]
);
$f->textarea(
-name=>"possibleValues",
-label=>WebGUI::International::get(487,"Asset"),
-hoverHelp=>WebGUI::International::get('Possible Values description',"Asset"),
-label=>$i18n->get(487),
-hoverHelp=>$i18n->get('Possible Values description'),
-value=>$fieldInfo->{possibleValues}
);
$f->submit();
$ac->setHelp("metadata edit property","Asset");
return $ac->render($f->print, WebGUI::International::get('Edit Metadata',"Asset"));
return $ac->render($f->print, $i18n->get('Edit Metadata'));
}
#-------------------------------------------------------------------
@ -219,6 +220,7 @@ sub www_editMetaDataFieldSave {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"content profiling");
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4));
my $i18n = WebGUI::International->new($self->session,"Asset");
$ac->setHelp("metadata edit property","Asset");
# Check for duplicate field names
my $sql = "select count(*) from metaData_properties where fieldName = ".
@ -228,12 +230,12 @@ sub www_editMetaDataFieldSave {
}
my ($isDuplicate) = $self->session->db->buildArray($sql);
if($isDuplicate) {
my $error = WebGUI::International::get("duplicateField", "Asset");
my $error = $i18n->get("duplicateField");
$error =~ s/\%field\%/$self->session->form->process("fieldName")/;
return $ac->render($error,WebGUI::International::get('Edit Metadata',"Asset"));
return $ac->render($error,$i18n->get('Edit Metadata'));
}
if($self->session->form->process("fieldName") eq "") {
return $ac->render(WebGUI::International::get("errorEmptyField", "Asset"),WebGUI::International::get('Edit Metadata',"Asset"));
return $ac->render($i18n->get("errorEmptyField"),$i18n->get('Edit Metadata'));
}
if($self->session->form->process("fid") eq 'new') {
$self->session->form->process("fid") = $self->session->id->generate();
@ -269,11 +271,12 @@ sub www_manageMetaData {
my $self = shift;
my $ac = WebGUI::AdminConsole->new($self->session,"contentProfiling");
return $self->session->privilege->insufficient() unless ($self->session->user->isInGroup(4));
$ac->addSubmenuItem($self->getUrl('func=editMetaDataField'), WebGUI::International::get("Add new field","Asset"));
my $i18n = WebGUI::International->new($self->session,"Asset");
$ac->addSubmenuItem($self->getUrl('func=editMetaDataField'), $i18n->get("Add new field"));
my $output;
my $fields = $self->getMetaDataFields();
foreach my $fieldId (keys %{$fields}) {
$output .= $self->session->icon->delete("func=deleteMetaDataField;fid=".$fieldId,$self->get("url"),WebGUI::International::get('deleteConfirm','Asset'));
$output .= $self->session->icon->delete("func=deleteMetaDataField;fid=".$fieldId,$self->get("url"),$i18n->get('deleteConfirm'));
$output .= $self->session->icon->edit("func=editMetaDataField;fid=".$fieldId,$self->get("url"));
$output .= " <b>".$fields->{$fieldId}{fieldName}."</b><br />";
}

View file

@ -152,7 +152,8 @@ sub authenticate {
return 1;
}
$self->user(WebGUI::User->new($self->session,1));
$self->error(WebGUI::International::get(68));
my $i18n = WebGUI::International->new($self->session);
$self->error($i18n->get(68));
return 0;
}

View file

@ -32,13 +32,14 @@ sub process {
@param = @_;
return WebGUI::International::get('no sku or id','Macro_Product') unless ($_[0]);
my $i18n = WebGUI::International->new($session,'Macro_Product');
return $i18n->get('no sku or id') unless ($_[0]);
($productId, $variantId) = $session->db->quickArray("select productId, variantId from productVariants where sku=".$session->db->quote($_[0]));
($productId) = $session->db->quickArray("select productId from products where sku=".$session->db->quote($_[0])) unless ($productId);
($productId) = $session->db->quickArray("select productId from products where productId=".$session->db->quote($_[0])) unless ($productId);
return WebGUI::International::get('cannot find product','Macro_Product') unless ($productId);
return $i18n->get('cannot find product') unless ($productId);
$product = WebGUI::Product->new($self->session,$productId);
@ -65,13 +66,13 @@ sub process {
'variant.sku' => $_->{sku},
'variant.compositionLoop' => \@compositionLoop,
'variant.addToCart.url' => $session->url->page('op=addToCart;itemType=Product;itemId='.$_->{variantId}),
'variant.addToCart.label' => WebGUI::International::get('add to cart', 'Macro_Product'),
'variant.addToCart.label' => $i18n->get('add to cart'),
}) if ($_->{available});
}
%var = %{$product->get};
$var{variantLoop} = \@variantLoop;
$var{'variants.message'} = WebGUI::International::get('available product configurations', 'Macro_Product');
$var{'variants.message'} = $i18n->get('available product configurations');
$templateId = $_[1] || $product->get('templateId');
return WebGUI::Asset::Template->new($ssession,$templateId)->process(\%var);

View file

@ -223,7 +223,8 @@ A string representing the output format for the date. Defaults to '%z %Z'. You c
sub epochToHuman {
my $self = shift;
my $language = WebGUI::International::getLanguage($self->session->user->profileField("language"));
my $i18n = WebGUI::International->new($self->session);
my $language = $i18n->getLanguage($self->session->user->profileField("language"));
my $locale = $language->{languageAbbreviation} || "en";
$locale .= "_".$language->{locale} if ($language->{locale});
my $timeZone = $self->session->user->profileField("timeZone") || "America/Chicago";
@ -312,21 +313,22 @@ An integer ranging from 1-7 representing the day of the week (Sunday is 1 and Sa
sub getDayName {
my $self = shift;
my $i18n = WebGUI::International->new($self->session,'DateTime');
my $day = $_[0];
if ($day == 7) {
return WebGUI::International::get('sunday','DateTime');
return $i18n->get('sunday');
} elsif ($day == 1) {
return WebGUI::International::get('monday','DateTime');
return $i18n->get('monday');
} elsif ($day == 2) {
return WebGUI::International::get('tuesday','DateTime');
return $i18n->get('tuesday');
} elsif ($day == 3) {
return WebGUI::International::get('wednesday','DateTime');
return $i18n->get('wednesday');
} elsif ($day == 4) {
return WebGUI::International::get('thursday','DateTime');
return $i18n->get('thursday');
} elsif ($day == 5) {
return WebGUI::International::get('friday','DateTime');
return $i18n->get('friday');
} elsif ($day == 6) {
return WebGUI::International::get('saturday','DateTime');
return $i18n->get('saturday');
}
}
@ -409,30 +411,31 @@ An integer ranging from 1-12 representing the month.
sub getMonthName {
my $self = shift;
my $i18n = WebGUI::International->new($self->session,'DateTime');
if ($_[0] == 1) {
return WebGUI::International::get('january','DateTime');
return $i18n->get('january');
} elsif ($_[0] == 2) {
return WebGUI::International::get('february','DateTime');
return $i18n->get('february');
} elsif ($_[0] == 3) {
return WebGUI::International::get('march','DateTime');
return $i18n->get('march');
} elsif ($_[0] == 4) {
return WebGUI::International::get('april','DateTime');
return $i18n->get('april');
} elsif ($_[0] == 5) {
return WebGUI::International::get('may','DateTime');
return $i18n->get('may');
} elsif ($_[0] == 6) {
return WebGUI::International::get('june','DateTime');
return $i18n->get('june');
} elsif ($_[0] == 7) {
return WebGUI::International::get('july','DateTime');
return $i18n->get('july');
} elsif ($_[0] == 8) {
return WebGUI::International::get('august','DateTime');
return $i18n->get('august');
} elsif ($_[0] == 9) {
return WebGUI::International::get('september','DateTime');
return $i18n->get('september');
} elsif ($_[0] == 10) {
return WebGUI::International::get('october','DateTime');
return $i18n->get('october');
} elsif ($_[0] == 11) {
return WebGUI::International::get('november','DateTime');
return $i18n->get('november');
} elsif ($_[0] == 12) {
return WebGUI::International::get('december','DateTime');
return $i18n->get('december');
}
}