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

Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.

Browse source
This commit is contained in:
Colin Kuskie 2010-07-27 22:55:57 -07:00
commit ca9a3bd6c7
34 changed files with 386 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

39
lib/WebGUI/Asset/Template.pm
View file

@ -139,6 +139,22 @@ These methods are available from this class:
#-------------------------------------------------------------------
=head2 cut ( )
Extend the base method to handle cutting the User Function Style template and destroying your site.
If the current template is the User Function Style template with the Fail Safe template.
=cut
around cut => sub {
my ( $orig, $self ) = @_;
my $returnValue = $self->$orig();
if ($returnValue && $self->getId eq $self->session->setting->get('userFunctionStyleId')) {
$self->session->setting->set('userFunctionStyleId', 'PBtmpl0000000000000060');
}
return $returnValue;
};
=head2 addRevision ( )
Override the master addRevision to copy attachments
@ -415,7 +431,7 @@ Override to import attachments from old versions of WebGUI
override importAssetCollateralData => sub {
my ( $self, $data, @args ) = @_;
if ( $data->{template_attachments} ) {
$self->update( { attachmentsJson => $data->{template_attachments} } );
$self->update( { attachmentsJson => JSON::to_json($data->{template_attachments}) } );
}
return super();
};
@ -617,6 +633,27 @@ sub processRaw {
#-------------------------------------------------------------------
=head2 purge ( )
Extend the base method to handle purging the User Function Style template and destroying your site.
If the current template is the User Function Style template with the Fail Safe template.
=cut
around purge => sub {
my $orig = shift;
my $self = shift;
my $session = $self->session;
my $assetId = $self->assetId;
my $returnValue = $self->$orig(@_);
if ($returnValue && $assetId eq $session->setting->get('userFunctionStyleId')) {
$session->setting->set('userFunctionStyleId', 'PBtmpl0000000000000060');
}
return $returnValue;
};
#-------------------------------------------------------------------
=head2 www_edit
Hand draw this form so that a warning can be displayed to the user when editing a