oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
Colin Kuskie 2010-09-28 09:32:33 -07:00
parent 0406e82546
commit 2adc7a24e2
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -2,6 +2,7 @@
- fixed #11884: Editing Templates impossible / Code editor not loaded - fixed #11884: Editing Templates impossible / Code editor not loaded
- recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked. - recommitted ukplayer. Removal broke Matrix. Licencing information was available but overlooked.
- fixed #11883: Wiki "Add page" link does not encode special chars - 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 7.10.1
- fixed #11851: Story Topic: top story variables should be available all the time - fixed #11851: Story Topic: top story variables should be available all the time

4
docs/templates.txt
View file

@ -3,6 +3,10 @@ templates, you will need to apply these changes manually to your copies.
7.10.1 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 * Asset Report Template - asset-report/asset-report-default-template
Remove the empty template attachment Remove the empty template attachment

BIN
docs/upgrades/packages-7.10.1/root_import_account_profile.wgpkg Normal file
View file

Binary file not shown.

5
lib/WebGUI/Account/Profile.pm
View file

@ -83,7 +83,8 @@ sub appendCategoryVars {
$var->{'profile_category_'.$categoryId."_shortLabel"} = $shortCategoryLabel; $var->{'profile_category_'.$categoryId."_shortLabel"} = $shortCategoryLabel;
$var->{'profile_category_'.$categoryId."_index" } = $index; $var->{'profile_category_'.$categoryId."_index" } = $index;
$var->{'profile_category_'.$categoryId."_fields" } = $fields; $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 #Update the isActive flag to determine the default active tab
$self->store->{hasActiveTab} = ($self->store->{hasActiveTab} || $isActive); $self->store->{hasActiveTab} = ($self->store->{hasActiveTab} || $isActive);
@ -472,8 +473,6 @@ sub www_view {
$self->appendCommonVars($var); $self->appendCommonVars($var);
$var->{'can_edit_profile' } = $uid eq $session->user->userId;
my $privacySetting = $user->profileField('publicProfile') || 'none'; my $privacySetting = $user->profileField('publicProfile') || 'none';
$var->{"profile_privacy_$privacySetting"} = "true"; $var->{"profile_privacy_$privacySetting"} = "true";