oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor www_add/www_edit to fix existing www_edit overrides

Browse source 
If you previously overrode www_edit to create a template, you must
instead override getEditTemplate and return your template from there.

Make sure to set your style template correctly.
This commit is contained in:
Doug Bell 2011-07-12 20:37:00 -05:00
parent d15891dbb9
commit 5736e5eb3a
1 changed files with 56 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

89
lib/WebGUI/Asset.pm
View file

@ -1087,12 +1087,9 @@ sub getEditForm {
my $class;
if ( $self->getId eq "new" ) {
$assetId = "new";
# This should NOT be set here!
$class = $session->form->process( "className", "className" );
}
else {
$assetId = $self->getId;
$class = $self->get('className');
}
$f->getTab("meta")->addField( "Guid",
name => "assetId",
@ -1103,7 +1100,7 @@ sub getEditForm {
);
$f->getTab("meta")->addField( "ClassName",
name => "className",
value => $class,
value => $self->className,
label => $i18n->get('class name', 'WebGUI'),
uiLevel => 9,
);
@ -1180,6 +1177,48 @@ sub setupFormField {
#-------------------------------------------------------------------
=head2 getEditTemplate ( )
Get the template to edit this asset. Used by www_edit and www_add to present
the form to the user. Uses getEditTemplateId to get the template ID.
=cut
sub getEditTemplate {
my ( $self ) = @_;
my $f = eval { $self->getEditForm };
if ( $@ ) {
$self->session->log->error(
sprintf "Couldn't build asset edit form for URL: '%s' because: %s", $self->url, $@
);
die $@;
}
$self->addEditSaveButtons( $f );
$f->action( $self->getUrl ); # Must be changed for www_add/www_addSave
my $template = WebGUI::Asset->newById( $self->session, $self->getEditTemplateId );
$template->addForm( form => $f );
$template->style( "PBtmpl0000000000000137" );
return $template;
}
#-------------------------------------------------------------------------
=head2 getEditTemplateId
Get the edit template ID for this asset. Defaults to the Asset Edit template from
the settings
=cut
sub getEditTemplateId {
my ( $self ) = @_;
return $self->session->setting->get('templateIdAssetEdit');
}
#-------------------------------------------------------------------
=head2 getExtraHeadTags ( )
Returns the extraHeadTags stored in the asset. Called in $self->session->style->generateAdditionalHeadTags if this asset is the current session asset. Also called in WebGUI::Layout::view for its child assets. Overriden in Shortcut.pm.
@ -2693,20 +2732,11 @@ sub www_add {
my $newAsset = WebGUI::Asset->newByPropertyHashRef($self->session,\%properties);
$newAsset->{_parent} = $self;
my $f = eval { $newAsset->getEditForm };
my $template = eval { $newAsset->getEditTemplate };
return $@ if $@;
$self->addEditSaveButtons( $f );
$f->addField( "Hidden", name => "func", value => "addSave" );
$f->action( $self->getUrl );
$f->getTab('meta')->getField( 'className' )->set('value', $class);
my $template = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
$template->setParam( %{ $f->toTemplateVars } );
return $self->session->style->process(
$template->process,
"PBtmpl0000000000000137"
);
$template->getForm("form")->action( $self->getUrl );
$template->getForm("form")->addField( "Hidden", name => "func", value => "addSave" );
return $template;
}
#----------------------------------------------------------------------------
@ -2764,7 +2794,11 @@ sub www_addSave {
tagId => $workingTag->getId,
status => "pending",
});
return $self->www_view unless defined $object;
if ( !defined $object ) {
my $url = $session->url->page;
$session->log->error( "Could not add child $className to $url!" );
return $self->www_view;
}
$object->{_parent} = $self;
$object->url(undef);
@ -2776,6 +2810,8 @@ sub www_addSave {
# Process properties from form post
my $errors = $object->processEditForm;
if (ref $errors eq 'ARRAY') {
my $url = $session->url->page;
$session->log->error( "Cannot add asset $className to $url: '" . join( "', '", @$errors ) . q{'} );
$session->stow->set('editFormErrors', $errors);
$object->purge;
return $self->www_add();
@ -2845,23 +2881,10 @@ sub www_edit {
my ( $style, $url ) = $session->quick(qw( style url ));
return $self->session->privilege->insufficient() unless $self->canEdit;
return $self->session->privilege->locked() unless $self->canEditIfLocked;
my $func = $self->session->form->get('func');
my $f = eval { $self->getEditForm };
if ( $@ ) {
$self->session->log->error(
sprintf "Couldn't build asset edit form for URL: '%s' because: %s", $self->url, $@
);
return $@;
}
$self->addEditSaveButtons( $f );
$f->addField( "Hidden", name => "func", value => "editSave" );
$f->action( $self->getUrl );
my $template = $self->getEditTemplate;
$template->getForm('form')->addField( "Hidden", name => "func", value => "editSave" );
my $template = WebGUI::Asset->newById( $session, $session->setting->get('templateIdAssetEdit') );
$template->setParam( %{ $f->toTemplateVars } );
$template->style( "PBtmpl0000000000000137" );
return $template;
}