end of test program sweeps for dictionary lookups via subroutine instead
of object method.
This commit is contained in:
parent
26700d9ac0
commit
edfaa153b9
16 changed files with 91 additions and 162 deletions
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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'));
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 ( )
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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 ( )
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue