Fixed bugs in navigation template vars and privilege bug in WG::A::File. Also added page.parent.rank tmpl_var to the nav template.
This commit is contained in:
parent
209e529a45
commit
e3b558fc2b
5 changed files with 23 additions and 6 deletions
|
|
@ -19,8 +19,14 @@
|
|||
- Fixed a bug that didn't allow you to search a matrix.
|
||||
- Fixed a bug in the upgrade that caused template problems with the WebGUI 6
|
||||
template if anyone was still using that.
|
||||
|
||||
|
||||
- Fixed a bug where the template variables currentPage.hasViewableSiblings
|
||||
and currentPage.hasViewableChildren were always false. Added the
|
||||
page.parent.rank template variable to the Navigation template. (Martin
|
||||
Kamerbeek / Procolix)
|
||||
- Fixed a bug where WebGUI::Asset::File->addRevision did not set correct
|
||||
privs to the storage associated with it. (Martin Kamerbeek / Procolix)
|
||||
|
||||
|
||||
7.0.1
|
||||
- fix: User profile field "Department" needs i18n
|
||||
- fix: AssetProxied Navigation context menu - items invisible in Style 02
|
||||
|
|
|
|||
|
|
@ -251,6 +251,7 @@ sub processPropertiesFromFormPost {
|
|||
delete $self->{_storageLocation};
|
||||
my $storage = $self->getStorageLocation;
|
||||
my $filename = $storage->addFileFromFormPost("file",1);
|
||||
$storage->setPrivileges($self->get('ownerUserId'), $self->get('groupIdView'), $self->get('groupIdEdit'));
|
||||
if (defined $filename && $filename ne $self->get("filename")) {
|
||||
my %data;
|
||||
$data{filename} = $filename;
|
||||
|
|
|
|||
|
|
@ -438,9 +438,9 @@ sub view {
|
|||
++$var->{"currentPage.hasSibling"}
|
||||
if $pageData->{"page.isSibling"};
|
||||
++$var->{"currentPage.hasViewableSiblings"}
|
||||
if ($pageData->{"page.isSibling"} && $pageData->{"isViewable"});
|
||||
if ($pageData->{"page.isSibling"} && $pageData->{"page.isViewable"});
|
||||
++$var->{"currentPage.hasViewableChildren"}
|
||||
if ($pageData->{"page.isChild"} && $pageData->{"isViewable"});
|
||||
if ($pageData->{"page.isChild"} && $pageData->{"page.isViewable"});
|
||||
|
||||
my $parent = $asset->getParent;
|
||||
if (defined $parent) {
|
||||
|
|
@ -449,7 +449,8 @@ sub view {
|
|||
}
|
||||
$pageData->{'page.parent.menuTitle'} = $parent->getMenuTitle;
|
||||
$pageData->{'page.parent.title'} = $parent->getTitle;
|
||||
$pageData->{"page.parent.url"} = $parent->getUrl;
|
||||
$pageData->{"page.parent.url"} = $parent->getUrl;
|
||||
$pageData->{"page.parent.rank"} = $parent->getRank;
|
||||
$pageData->{"page.isRankedFirst"} = 1 unless exists $lastChildren{$parent->getId};
|
||||
$lastChildren{$parent->getId} = $asset->getId;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -265,7 +265,10 @@ our $HELP = {
|
|||
},
|
||||
{
|
||||
'name' => 'page.parent.newWindow'
|
||||
}
|
||||
},
|
||||
{
|
||||
'name' => 'page.parent.rank'
|
||||
},
|
||||
]
|
||||
}
|
||||
],
|
||||
|
|
|
|||
|
|
@ -529,6 +529,12 @@ a Google sitemap of your site.</p>
|
|||
lastUpdated => 1149394665,
|
||||
},
|
||||
|
||||
'page.parent.rank' => {
|
||||
message => q|The rank of the mother of this page.|,
|
||||
lastUpdated => 1153314572,
|
||||
},
|
||||
|
||||
|
||||
'1097' => {
|
||||
message => q|<p>These variables are available in Navigation Templates:</p>
|
||||
|,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue