From 2adc7a24e268b5068346468d17d4ac0464445227 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 28 Sep 2010 09:32:33 -0700 Subject: [PATCH] Move "back to profile" link from Account Profile Layout template into the View template. Added the can_edit_profile template variable to common template variables for the Profile plugin. --- docs/changelog/7.x.x.txt | 1 + docs/templates.txt | 4 ++++ .../root_import_account_profile.wgpkg | Bin 0 -> 4609 bytes lib/WebGUI/Account/Profile.pm | 5 ++--- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 028139c8b..775c2da82 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -2,6 +2,7 @@ - fixed #11884: Editing Templates impossible / Code editor not loaded - recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked. - fixed #11883: Wiki "Add page" link does not encode special chars + - fixed #11886: profile knows it's me, but doesn't display edit 7.10.1 - fixed #11851: Story Topic: top story variables should be available all the time diff --git a/docs/templates.txt b/docs/templates.txt index 19187a088..c29a10cb0 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -3,6 +3,10 @@ templates, you will need to apply these changes manually to your copies. 7.10.1 + * Profile templates - root/import/account/profile/default-view-profile-template + - root/import/account/profile/profile-account-layout + Moved the "back to profile" link from the Profile View template to the Profile Layout template. + * Asset Report Template - asset-report/asset-report-default-template Remove the empty template attachment diff --git a/docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg b/docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg new file mode 100644 index 0000000000000000000000000000000000000000..f609b3d3b4afd86f6c147350e2a2a786e5c449e8 GIT binary patch literal 4609 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 literal 0 HcmV?d00001 diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm index e5ff26d19..2daed6b2e 100644 --- a/lib/WebGUI/Account/Profile.pm +++ b/lib/WebGUI/Account/Profile.pm @@ -83,7 +83,8 @@ sub appendCategoryVars { $var->{'profile_category_'.$categoryId."_shortLabel"} = $shortCategoryLabel; $var->{'profile_category_'.$categoryId."_index" } = $index; $var->{'profile_category_'.$categoryId."_fields" } = $fields; - + + $var->{'can_edit_profile' } = $self->uid eq $self->session->user->userId; #Update the isActive flag to determine the default active tab $self->store->{hasActiveTab} = ($self->store->{hasActiveTab} || $isActive); @@ -472,8 +473,6 @@ sub www_view { $self->appendCommonVars($var); - $var->{'can_edit_profile' } = $uid eq $session->user->userId; - my $privacySetting = $user->profileField('publicProfile') || 'none'; $var->{"profile_privacy_$privacySetting"} = "true";