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

fixed Gallery Cross Publish not displaying correctly

Browse source
This commit is contained in:
Doug Bell 2008-08-13 20:56:04 +00:00
parent 7aca0d15f8
commit e141a01d31
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Asset/File/GalleryFile.pm
View file

@ -989,16 +989,12 @@ sub www_editCommentSave {
Display the form to make a shortcut.
This page is only available to those who can edit this GalleryFile.
=cut
sub www_makeShortcut {
my $self = shift;
my $session = $self->session;
return $self->session->privilege->insufficient unless $self->canEdit;
# Create the form to make a shortcut
my $var = $self->getTemplateVars;
@ -1043,8 +1039,6 @@ sub www_makeShortcutSave {
my $self = shift;
my $form = $self->session->form;
return $self->session->privilege->insufficient unless $self->canEdit;
my $parentId = $form->get('parentId');
my $shortcut = $self->makeShortcut( $parentId );

3
lib/WebGUI/Asset/Shortcut.pm
View file

@ -612,7 +612,8 @@ sub getPrefFieldsToImport {
=head2 getTemplateVars
Gets the template vars for this shortcut.
Gets the template vars for the asset we're a shortcut to, with any overrides
applied.
=cut

8
lib/WebGUI/Asset/Wobject/GalleryAlbum.pm
View file

@ -162,7 +162,10 @@ sub addChild {
# Load the class
WebGUI::Pluggable::load( $properties->{className} );
if ( !$properties->{className}->isa( $fileClass ) ) {
# Make sure we only add appropriate child classes
if ( !$properties->{className}->isa( $fileClass )
&& !$properties->{ className }->isa( "WebGUI::Asset::Shortcut" )
) {
$self->session->errorHandler->security(
"add a ".$properties->{className}." to a ".$self->get("className")
);
@ -589,6 +592,9 @@ sub getThumbnailUrl {
if ( $asset->can("getThumbnailUrl") ) {
return $asset->getThumbnailUrl;
}
elsif ( $asset->isa( "WebGUI::Asset::Shortcut" ) ) {
return $asset->getShortcut->getThumbnailUrl;
}
else {
return undef;
}