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

finished migrating article, fixed some bugs, and enhanced the file asset api

Browse source
This commit is contained in:
JT Smith 2005-01-02 01:32:54 +00:00
parent ad755e0e78
commit f8ca6ec5bd
8 changed files with 82 additions and 265 deletions
Download patch file Download diff file Expand all files Collapse all files

55
lib/WebGUI/Asset/File.pm
View file

@ -85,6 +85,16 @@ sub definition {
return $class->SUPER::definition($definition);
}
sub getBox {
my $self = shift;
my %var;
$var{"attachment.icon"} = $self->getFileIcon;
$var{"attachment.url"} = $self->getFileUrl;
$var{"attachment.name"} = $self->get("filename");
$var{"attachment.size"} = $self->getStorageLocation->getSize;
$var{"attachment.type"} = $self->getStorageLocation->getFileExtension;
return WebGUI::Template::process(1,"AttachmentBox",\%var);
}
#-------------------------------------------------------------------
@ -99,10 +109,9 @@ sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm();
if ($self->get("filename") ne "") {
my $storage = WebGUI::Storage->get($self->get("storageId"));
$tabform->getTab("properties")->readOnly(
-label=>"Current File",
-value=>'<a href="'.$storage->getUrl($self->get("filename")).'"><img src="'.$storage->getFileIconUrl($self->get("filename")).'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getFileIconUrl.'" alt="'.$self->get("filename").'" border="0" align="middle" /> '.$self->get("filename").'</a>'
);
}
@ -114,13 +123,27 @@ sub getEditForm {
}
#-------------------------------------------------------------------
sub getFileUrl {
my $self = shift;
return $self->getStorageLocation->getUrl($self->get("filename"));
}
#-------------------------------------------------------------------
sub getFileIconUrl {
my $self = shift;
return $self->getStorageLocation->getFileIconUrl($self->get("filename"));
}
#-------------------------------------------------------------------
sub getIcon {
my $self = shift;
my $small = shift;
if ($small) {
my $storage = WebGUI::Storage->get($self->get("storageId"));
return $storage->getFileIconUrl($self->get("filename"));
return $self->getFileIconUrl;
}
return $session{config}{extrasURL}.'/assets/file.gif';
}
@ -138,11 +161,19 @@ sub getName {
return "File";
}
sub getStorageLocation {
my $self = shift;
unless (exists $self->{_storageLocation}) {
$self->{_storageLocation} = WebGUI::Storage->get($self->get("storageId"));
}
return $self->{_storageLocation};
}
sub processPropertiesFromFormPost {
my $self = shift;
$self->SUPER::processPropertiesFromFormPost;
my $storage = WebGUI::Storage->create;
my $storage = $self->{_storageLocation} = WebGUI::Storage->create;
my $filename = $storage->addFileFromFormPost("file");
if (defined $filename) {
my $oldVersions;
@ -163,8 +194,7 @@ sub processPropertiesFromFormPost {
$storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit"));
} else {
$storage->delete;
my $storage = WebGUI::Storage->get($self->get("storageId"));
$storage->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit"));
$self->getStorageLocation->setPrivileges($self->get("ownerUserId"), $self->get("groupIdView"), $self->get("groupIdEdit"));
}
}
@ -183,19 +213,17 @@ sub purge {
my $storage = WebGUI::Storage->get($storageId);
$storage->delete;
}
my $storage = WebGUI::Storage->get($self->get("storageId"));
$storage->delete;
$self->getStorageLocation->delete;
return $self->SUPER::purge;
}
sub view {
my $self = shift;
my $storage = WebGUI::Storage->get($self->get("storageId"));
my %var = %{$self->get};
$var{controls} = $self->getToolbar;
$var{fileUrl} = $storage->getUrl($self->get("filename"));
$var{fileIcon} = $storage->getFileIconUrl($self->get("filename"));
$var{fileUrl} = $self->getFileUrl;
$var{fileIcon} = $self->getFileIconUrl;
return WebGUI::Template::process("1","FileAsset",\%var);
}
@ -214,8 +242,7 @@ sub www_view {
if ($session{var}{adminOn}) {
return $self->www_edit;
}
my $storage = WebGUI::Storage->get($self->get("storageId"));
WebGUI::HTTP::setRedirect($storage->getUrl($self->get("filename")));
WebGUI::HTTP::setRedirect($self->getFileUrl);
return "";
}

22
lib/WebGUI/Asset/File/Image.pm
View file

@ -18,7 +18,6 @@ use strict;
use WebGUI::Asset::File;
use WebGUI::HTTP;
use WebGUI::Session;
use WebGUI::Storage;
use WebGUI::Utility;
# do a check to see if they've installed Image::Magick
@ -102,7 +101,7 @@ sub generateThumbnail {
$self->update({thumbnailSize=>$thumbnailSize});
}
if (defined $self->get("filename") && $hasImageMagick) {
my $storage = WebGUI::Storage->get($self->get("storageId"));
my $storage = $self->getStorageLocation;
my $image = Image::Magick->new;
my $error = $image->Read($storage->getPath($self->get("filename")));
if ($error) {
@ -153,10 +152,9 @@ sub getEditForm {
-value=>$self->getValue("parameters")
);
if ($self->get("filename") ne "") {
my $storage = WebGUI::Storage->get($self->get("storageId"));
$tabform->getTab("properties")->readOnly(
-label=>"Thumbnail",
-value=>'<a href="'.$storage->getUrl($self->get("filename")).'"><img src="'.$storage->getUrl("thumb-".$self->get("filename")).'?noCache='.time().'" alt="thumbnail" /></a>'
-value=>'<a href="'.$self->getFileUrl.'"><img src="'.$self->getThumbnailUrl.'?noCache='.time().'" alt="thumbnail" /></a>'
);
}
return $tabform;
@ -184,6 +182,13 @@ sub getName {
return "Image";
}
sub getThumbnailUrl {
my $self = shift;
return $self->getStorageLocation->getUrl("thumb-".$self->get("filename"));
}
sub processPropertiesFromFormPost {
my $self = shift;
$self->SUPER::processPropertiesFromFormPost;
@ -196,12 +201,11 @@ sub processPropertiesFromFormPost {
sub view {
my $self = shift;
my $storage = WebGUI::Storage->get($self->get("storageId"));
my %var = %{$self->get};
$var{controls} = $self->getToolbar;
$var{fileUrl} = $storage->getUrl($self->get("filename"));
$var{fileIcon} = $storage->getFileIconUrl($self->get("filename"));
$var{thumbnail} = $storage->getUrl("thumb-".$self->get("filename"));
$var{fileUrl} = $self->getFileUrl;
$var{fileIcon} = $self->getFileIconUrl;
$var{thumbnail} = $self->getThumbnailUrl;
return WebGUI::Template::process("1","ImageAsset",\%var);
}
@ -227,7 +231,7 @@ sub www_view {
if ($session{var}{adminOn}) {
return $self->www_edit;
}
my $storage = WebGUI::Storage->get($self->get("storageId"));
my $storage = $self->getStorageLocation;
WebGUI::HTTP::setRedirect($storage->getUrl($self->get("filename")));
return "";
}

34
lib/WebGUI/Asset/Wobject/Article.pm
View file

@ -96,17 +96,24 @@ sub getName {
#-------------------------------------------------------------------
sub view {
my $self = shift;
my ($file, %var);
if ($self->get("image") ne "") {
$file = WebGUI::Attachment->new($self->get("image"),$self->get("wobjectId"));
$var{"image.url"} = $file->getURL;
$var{"image.thumbnail"} = $file->getThumbnail;
my %var;
my $children = $self->getLineage(["children"],{returnObjects=>1,includeOnlyClasses=>["WebGUI::Asset::File","WebGUI::Asset::File::Image"]});
foreach my $child (@{$children}) {
if (ref $child eq "WebGUI::Asset::File") {
$var{"attachment.box"} = $child->getBox;
$var{"attachment.icon"} = $child->getFileIcon;
$var{"attachment.url"} = $child->getFileUrl;
$var{"attachment.name"} = $child->get("filename");
} elsif (ref $child eq "WebGUI::Asset::File::Image") {
$var{"image.url"} = $child->getFileUrl;
$var{"image.thumbnail"} = $child->getThumbnailUrl;
}
}
$var{description} = $self->get("description");
if ($self->get("convertCarriageReturns")) {
$var{description} =~ s/\n/\<br\>\n/g;
}
$var{"new.template"} = $self->getUrl("wid=".$self->get("wobjectId")."&func=view")."&overrideTemplateId=";
$var{"new.template"} = $self->getUrl."&overrideTemplateId=";
$var{"description.full"} = $var{description};
$var{"description.full"} =~ s/\^\-\;//g;
$var{"description.first.100words"} = $var{"description.full"};
@ -131,7 +138,7 @@ sub view {
$var{"description.first.2sentences"} =~ s/^((.*?\.){2}).*/$1/s;
$var{"description.first.sentence"} = $var{"description.first.2sentences"};
$var{"description.first.sentence"} =~ s/^(.*?\.).*/$1/s;
my $p = WebGUI::Paginator->new($self->getUrl("wid=".$self->get("wobjectId")."&func=view"),1);
my $p = WebGUI::Paginator->new($self->getUrl,1);
if ($session{form}{makePrintable} || $var{description} eq "") {
$var{description} =~ s/\^\-\;//g;
$p->setDataByArrayRef([$var{description}]);
@ -141,21 +148,14 @@ sub view {
$var{description} = $p->getPage;
}
$p->appendTemplateVars(\%var);
if ($self->get("attachment") ne "") {
$file = WebGUI::Attachment->new($self->get("attachment"),$self->get("wobjectId"));
$var{"attachment.box"} = $file->box;
$var{"attachment.icon"} = $file->getIcon;
$var{"attachment.url"} = $file->getURL;
$var{"attachment.name"} = $file->getFilename;
}
my $callback = $self->getUrl("func=view&amp;wid=".$self->get("wobjectId"));
my $callback = $self->getUrl;
if ($self->get("allowDiscussion")) {
my $forum = WebGUI::Forum->new($self->get("forumId"));
$var{"replies.count"} = ($forum->get("replies") + $forum->get("threads"));
$var{"replies.URL"} = WebGUI::Forum::UI::formatForumURL($callback,$forum->get("forumId"));
$var{"replies.label"} = WebGUI::International::get(28,$self->get("namespace"));
$var{"replies.label"} = WebGUI::International::get(28,"Article");
$var{"post.URL"} = WebGUI::Forum::UI::formatNewThreadURL($callback,$forum->get("forumId"));
$var{"post.label"} = WebGUI::International::get(24,$self->get("namespace"));
$var{"post.label"} = WebGUI::International::get(24,"Article");
}
my $templateId = $self->get("templateId");
if ($session{form}{overrideTemplateId} ne "") {

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

@ -133,13 +133,7 @@ sub getUiLevel {
#-------------------------------------------------------------------
sub view {
my $self = shift;
my $children = $self->getLineage(
["descendants"],
{
returnObjects=>1,
endingLineageLength=>$self->getLineageLength+1
}
);
my $children = $self->getLineage( ["children"], { returnObjects=>1 });
my %vars;
# I'm sure there's a more efficient way to do this. We'll figure it out someday.
my @positions = split(/\./,$self->get("contentPositions"));