fixed bug 647673
This commit is contained in:
parent
11de5b4839
commit
f5a68ba7a8
1 changed files with 9 additions and 5 deletions
|
|
@ -372,7 +372,7 @@ sub www_editCollateralFolderSave {
|
|||
#-------------------------------------------------------------------
|
||||
sub www_listCollateral {
|
||||
return WebGUI::Privilege::insufficient unless (WebGUI::Privilege::isInGroup(4));
|
||||
my (%type, %user, $f, $row, $data, $sth, $url, $output, $parent, $p, $thumbnail, $file, $page, $constraints, $folderId, $crCount);
|
||||
my (%type, %user, $f, $row, $data, $sth, $url, $output, $parent, $p, $thumbnail, $file, $page, $constraints, $folderId);
|
||||
tie %type, 'Tie::IxHash';
|
||||
tie %user, 'Tie::IxHash';
|
||||
%type = (
|
||||
|
|
@ -457,15 +457,19 @@ sub www_listCollateral {
|
|||
$file = WebGUI::Attachment->new($row->{filename},"images",$row->{collateralId});
|
||||
$thumbnail = '<a href="'.$url.'"><img src="'.$file->getIcon.'" border="0" /></a>';
|
||||
} elsif ($row->{collateralType} eq "snippet") {
|
||||
$crCount = $row->{parameters} =~ s/(\n[^\n]\r?|\r[^\r]\n?)/\↵/gs;
|
||||
$row->{parameters} = WebGUI::HTML::filter($row->{parameters},'all');
|
||||
$thumbnail = substr($row->{parameters},0,$session{setting}{snippetsPreviewLength}+$crCount*6);
|
||||
$thumbnail = WebGUI::HTML::filter($row->{parameters},'all');
|
||||
$thumbnail =~ s/(\n[^\n]\r?|\r[^\r]\n?)/\↵/gs;
|
||||
$thumbnail =~ s/\s{2,}//g;
|
||||
$thumbnail =~ s/\s*\↵+\s*/\↵/g;
|
||||
$thumbnail =~ s/^(\↵)+//;
|
||||
my $crCount = $thumbnail =~ m/\↵/g;
|
||||
$thumbnail = substr($thumbnail,0,$session{setting}{snippetsPreviewLength}+$crCount*6);
|
||||
$thumbnail .= '...' if (length($row->{parameters}) > $session{setting}{snippetsPreviewLength});
|
||||
} else {
|
||||
$thumbnail = "";
|
||||
}
|
||||
$output .= '<td class="tableData">'.$thumbnail.'</td>';
|
||||
$output .= '</tr>';
|
||||
$output .= "</tr>\n";
|
||||
}
|
||||
$output .= '</table>';
|
||||
$output .= $p->getBarTraditional;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue