From 6eb8c0aad297ebe0aedfeadc0652c86ebfb90289 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Fri, 10 Oct 2008 17:16:41 +0000 Subject: [PATCH] 8802 fix Folder template variable problem --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/Folder.pm | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index f8e9893b2..a101c75ac 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -35,6 +35,7 @@ - rfe: Thingy: Max entries per user (SDH Consulting Group) - fixed: #4174: UserList template show links that should be hidden (Yung Han Khoe) + - fixed #8802: isImage not functioning in Folders 7.6.0 - added: users may now customize the post received page for the CS diff --git a/lib/WebGUI/Asset/Wobject/Folder.pm b/lib/WebGUI/Asset/Wobject/Folder.pm index 2d4d16941..5127c58db 100644 --- a/lib/WebGUI/Asset/Wobject/Folder.pm +++ b/lib/WebGUI/Asset/Wobject/Folder.pm @@ -255,16 +255,20 @@ sub view { url => $child->getUrl, canEdit => $child->canEdit, controls => $child->getToolbar, + class => ref $child, }; - if ( ref $child =~ /^WebGUI::Asset::File::Image/ ) { - $child->{ "isImage" } = 1; - $child->{ "thumbnail.url" } = $child->getThumbnailUrl; + $self->session->log->warn(ref $child); + if ( $child->isa('WebGUI::Asset::File::Image') ) { + $self->session->log->warn('is image'); + $childVars->{ "isImage" } = 1; + $childVars->{ "thumbnail.url" } = $child->getThumbnailUrl; } - if ( ref $child =~ /^WebGUI::Asset::File/ ) { - $child->{ "isFile" } = 1; - $child->{ "file.url" } = $child->getFileUrl; + if ( $child->isa('WebGUI::Asset::File') ) { + $self->session->log->warn('is file'); + $childVars->{ "isFile" } = 1; + $childVars->{ "file.url" } = $child->getFileUrl; } push @{ $vars->{ "file_loop" } }, $childVars;