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.
plainblack · Sep 28, 2010 · ae02a4b · ae02a4b
1 parent 0e8d5cf
commit ae02a4b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
@@ -8,6 +8,7 @@
  - fixed #11876: packing templates, snippets, headtags removes conditional CSS comments
  - fixed #11877: Criteria Builder on "shortcut by alternate criteria" gets ugly with many checkbox items
  - fixed #11883: Wiki "Add page" link does not encode special chars
+ - fixed #11886: profile knows it's me, but doesn't display edit
 
 7.9.14
  - fixed #11812: Checking www_ajaxSave's response in the cart js

diff --git a/docs/templates.txt b/docs/templates.txt
@@ -1,6 +1,12 @@
 This is a running list of template changes made during upgrades.  If you have copied the default
 templates, you will need to apply these changes manually to your copies.
 
+7.9.15
+
+  *  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.
+
 7.9.14
 
   *  Asset Report Template - asset-report/asset-report-default-template

diff --git a/docs/upgrades/packages-7.9.15/root_import_account_profile.wgpkg b/docs/upgrades/packages-7.9.15/root_import_account_profile.wgpkg
diff --git 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";