added the 7.0 modification script
added the photogallery prototype fixed a bug in the wiki add a page thing fixed a bug with prototypes
This commit is contained in:
parent
29bd26a975
commit
e689c33db6
4 changed files with 71 additions and 4 deletions
|
|
@ -175,7 +175,7 @@ sub page {
|
|||
if (defined($output) and $output eq "") {
|
||||
if ($session->var->isAdminOn) { # they're expecting it to be there, so let's help them add it
|
||||
my $asset = WebGUI::Asset->newByUrl($session, $session->url->getRefererUrl) || WebGUI::Asset->getDefault($session);
|
||||
$session->http->setRedirect($asset->getUrl("func=add;assetId=new;class=WebGUI::Asset::Wobject::Layout;url=".$assetUrl));
|
||||
$session->http->setRedirect($asset->getUrl("func=add;class=WebGUI::Asset::Wobject::Layout;url=".$assetUrl));
|
||||
} else { # not in admin mode, so can't create it, so display not found
|
||||
$session->http->setStatus("404","Page Not Found");
|
||||
my $notFound = WebGUI::Asset->getNotFound($session);
|
||||
|
|
|
|||
|
|
@ -1677,7 +1677,7 @@ sub www_add {
|
|||
return "";
|
||||
}
|
||||
if ($self->session->form->process('prototype')) {
|
||||
my $prototype = WebGUI::Asset->new($self->session->form->process("prototype"),$class);
|
||||
my $prototype = WebGUI::Asset->new($self->session, $self->session->form->process("prototype"),$class);
|
||||
foreach my $definition (@{$prototype->definition($self->session)}) { # cycle through rather than copying properties to avoid grabbing stuff we shouldn't grab
|
||||
foreach my $property (keys %{$definition->{properties}}) {
|
||||
next if (isIn($property,qw(title menuTitle url isPrototype isPackage)));
|
||||
|
|
@ -1696,10 +1696,11 @@ sub www_add {
|
|||
printableStyleTemplateId => $self->get("printableStyleTemplateId"),
|
||||
isHidden => $self->get("isHidden"),
|
||||
className=>$class,
|
||||
url=>$self->session->form->param("url"),
|
||||
assetId=>"new"
|
||||
assetId=>"new",
|
||||
url=>$self->session->form->param("url")
|
||||
);
|
||||
$properties{isHidden} = 1 unless (WebGUI::Utility::isIn($class, @{$self->session->config->get("assetContainers")}));
|
||||
$self->session->errorHandler->warn($properties{url});
|
||||
my $newAsset = WebGUI::Asset->newByPropertyHashRef($self->session,\%properties);
|
||||
$newAsset->{_parent} = $self;
|
||||
return $self->session->privilege->insufficient() unless ($newAsset->canAdd($self->session));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue