bugs fixed
This commit is contained in:
parent
e6818b58fc
commit
5f33a4a15d
11 changed files with 55 additions and 34 deletions
|
|
@ -527,7 +527,7 @@ sub www_htmlArealistCollateral {
|
|||
my $parent = $folderId;
|
||||
# push parent folders in array so it can be reversed
|
||||
unshift(@parents, $parent);
|
||||
until($parent == 0) {
|
||||
until($parent eq '0') {
|
||||
($parent) = WebGUI::SQL->quickArray("select parentId from collateralFolder where collateralFolderId=".quote($parent));
|
||||
unshift(@parents, $parent);
|
||||
}
|
||||
|
|
@ -544,7 +544,7 @@ sub www_htmlArealistCollateral {
|
|||
}
|
||||
# Extend tree with closed folders in current folder
|
||||
$sth = WebGUI::SQL->read("select collateralFolderId, name, description from collateralFolder
|
||||
where parentId=".quote($folderId)." and collateralFolderId<>0 order by name");
|
||||
where parentId=".quote($folderId)." and collateralFolderId <> '0' order by name");
|
||||
while ($data = $sth->hashRef) {
|
||||
my ($itemsInFolder) = WebGUI::SQL->quickArray("select count(*) from collateral where
|
||||
collateralFolderId = ".quote($data->{collateralFolderId}));
|
||||
|
|
|
|||
|
|
@ -543,17 +543,17 @@ sub www_editPageSave {
|
|||
if ($session{form}{pageId} eq "new") {
|
||||
$pageId = $session{form}{parentId};
|
||||
} else {
|
||||
$page = WebGUI::Page->getPage($session{form}{pageId});
|
||||
$pageId = $session{form}{pageId};
|
||||
}
|
||||
|
||||
return WebGUI::Privilege::insufficient() unless (WebGUI::Page::canEdit($pageId));
|
||||
|
||||
if ($session{form}{pageId} eq "new") {
|
||||
$currentPage = WebGUI::Page->getPage($pageId);
|
||||
$currentPage = WebGUI::Page->getPage($session{form}{parentId});
|
||||
$page = $currentPage->add;
|
||||
$page->set({parentId=>$session{form}{parentId}});
|
||||
} else {
|
||||
$page = WebGUI::Page->getPage($session{form}{pageId});
|
||||
}
|
||||
|
||||
$session{form}{title} = "no title" if ($session{form}{title} eq "");
|
||||
$session{form}{menuTitle} = $session{form}{title} if ($session{form}{menuTitle} eq "");
|
||||
my $url = $session{form}{urlizedTitle};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue