- fix [ 1169379 ] eventscalendar wobjects have wrong scope after upgrade
This commit is contained in:
parent
8d2bc13dac
commit
a6e72eb707
2 changed files with 5 additions and 4 deletions
|
|
@ -14,6 +14,7 @@
|
|||
- fix [ 1167917 ] Link to Page Tree and No-Cache Imcompatible
|
||||
- fix [ 1168084 ] file uploads don't work.
|
||||
- fix [ 1167720 ] Folder::view() subfolder_loop - missing.. [mwilson]
|
||||
- fix [ 1169379 ] eventscalendar wobjects have wrong scope after upgrade
|
||||
|
||||
|
||||
6.5.3
|
||||
|
|
|
|||
|
|
@ -111,8 +111,8 @@ sub getEditForm {
|
|||
-value=>[$self->getValue("scope")],
|
||||
-options=>{
|
||||
0=>WebGUI::International::get(508,"EventsCalendar"),
|
||||
1=>WebGUI::International::get(509,"EventsCalendar"),
|
||||
2=>WebGUI::International::get(510,"EventsCalendar"),
|
||||
1=>WebGUI::International::get(510,"EventsCalendar"),
|
||||
2=>WebGUI::International::get(509,"EventsCalendar"),
|
||||
}
|
||||
);
|
||||
$tabform->getTab("display")->template(
|
||||
|
|
@ -239,10 +239,10 @@ sub view {
|
|||
if ($scope == 0) { #calendar's scope is regular (immediate descendants)
|
||||
$children = $self->getLineage(["children"],{returnObjects=>1,
|
||||
includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]});
|
||||
} elsif ($scope == 1) { #calendar is master
|
||||
} elsif ($scope == 2) { #calendar is master
|
||||
$children = $self->getLineage(["descendants"],{returnObjects=>1,
|
||||
includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]});
|
||||
} elsif ($scope == 2) { #calendar is global
|
||||
} elsif ($scope == 1) { #calendar is global
|
||||
$children = WebGUI::Asset::getRoot()->getLineage(["descendants"],{returnObjects=>1,
|
||||
includeOnlyClasses=>["WebGUI::Asset::Event","WebGUI::Asset::Relation"]});
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue