diff --git a/docs/upgrades/upgrade_6.2.11-6.3.0.pl b/docs/upgrades/upgrade_6.2.11-6.3.0.pl index ee9977443..822b60f79 100644 --- a/docs/upgrades/upgrade_6.2.11-6.3.0.pl +++ b/docs/upgrades/upgrade_6.2.11-6.3.0.pl @@ -626,8 +626,8 @@ while (my ($id, $template, $namespace) = $sth->array) { $template =~ s/\//ixsg; $template =~ s/\//ixsg; $template =~ s/canPost/user.canPost/ixsg; - $template =~ s/canModerate/user.canModerate/ixsg; - $template =~ s/isCurrentUser/user.isPoster/ixsg; + $template =~ s/canModerate/user.isModerator/ixsg; + $template =~ s/submission\.currentUser/user.isPoster/ixsg; $template =~ s/submission\.id/assetId/ixsg; $template =~ s/submission\.isNew/isNewPost/ixsg; $template =~ s/submission\.content\.full/content/ixsg; @@ -637,7 +637,10 @@ while (my ($id, $template, $namespace) = $sth->array) { $template =~ s/submission\.date.updated/dateUpdated.human/ixsg; $template =~ s/submission\.date/dateSubmitted.human/ixsg; $template =~ s/submission\.userProfile/userProfile.url/ixsg; - $template =~ s/submission\.currentUser/isCurrentUser/ixsg; + $template =~ s/submission\.secondColumn/isSecond/ixsg; + $template =~ s/submission\.thirdColumn/isThird/ixsg; + $template =~ s/submission\.fourthColumn/isFourth/ixsg; + $template =~ s/submission\.fifthColumn/isFifth/ixsg; $template =~ s/submission\.//ixsg; $template =~ s/user\.Profile/userProfile.url/ixsg; $template =~ s/user\.id/ownerUserId/ixsg; @@ -1303,6 +1306,11 @@ sub walkTree { status=>lc($submission->{status}), views=>$submission->{views}, contentType=>$submission->{contentType}, + userDefined1=>$submission->{userDefined1}, + userDefined2=>$submission->{userDefined2}, + userDefined3=>$submission->{userDefined3}, + userDefined4=>$submission->{userDefined4}, + userDefined5=>$submission->{userDefined5}, rating=>0 },undef,$id); my $threadSubscriptionGroup = WebGUI::Group->new("new"); diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 03d3edb93..54ddb42c9 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -334,7 +334,7 @@ sub getTemplateVars { my $self = shift; my %var = (%{$self->get}); $var{"userId"} = $self->get("ownerUserId"); - $var{"user.isPoster"} = ($self->get("ownerUserId") eq $session{user}{userId}); + $var{"user.isPoster"} = $self->isPoster; $var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted")); $var{"dateUpdated.human"} = epochToHuman($self->get("dateUpdated")); diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index 31f7e1fdc..4d5130e21 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -83,7 +83,7 @@ sub appendPostListTemplateVars { "isThird"=>(($i+1)%3==0), "isFourth"=>(($i+1)%4==0), "isFifth"=>(($i+1)%5==0), - "currentUserIsPoster"=>$post->isPoster + "user.isPoster"=>$post->isPoster }); $i++; }