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

Fix getProfileUrl, so it works with preventProxyCache. fixes #10877

Browse source
This commit is contained in:
Colin Kuskie 2009-09-02 19:07:54 -07:00
parent 831664397d
commit fea30d0db0
3 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,5 @@
7.8.0 7.8.0
- fixed #10877: getProfileUrl() broken
- fixed #10844: Ad Sales: No template variable Help - fixed #10844: Ad Sales: No template variable Help
- fixed #10873: Code editor breaks CSS comments - fixed #10873: Code editor breaks CSS comments

2
lib/WebGUI/User.pm
View file

@ -814,7 +814,7 @@ sub getProfileUrl {
my $identifier = $session->config->get("profileModuleIdentifier"); my $identifier = $session->config->get("profileModuleIdentifier");
return qq{$page?op=account;module=$identifier;do=view;uid=}.$self->userId; return $session->url->append($page,qq{op=account;module=$identifier;do=view;uid=}.$self->userId);
} }

18
t/User.t
View file

@ -22,7 +22,7 @@ use WebGUI::User;
use WebGUI::ProfileField; use WebGUI::ProfileField;
use WebGUI::Shop::AddressBook; use WebGUI::Shop::AddressBook;
use Test::More tests => 225; # increment this value for each test you create use Test::More tests => 226; # increment this value for each test you create
use Test::Deep; use Test::Deep;
use Data::Dumper; use Data::Dumper;
@ -833,6 +833,7 @@ isa_ok( $newCreateUser, 'WebGUI::User', 'create() returns a WebGUI::User' );
# getProfileUrl # getProfileUrl
# #
################################################################ ################################################################
$session->setting->set('preventProxyCache', 0);
WebGUI::Test->originalConfig('profileModuleIdentifier'); WebGUI::Test->originalConfig('profileModuleIdentifier');
my $profileModuleId = $session->config->get('profileModuleIdentifier'); my $profileModuleId = $session->config->get('profileModuleIdentifier');
@ -845,7 +846,7 @@ $session->config->set('profileModuleIdentifier', 'someOtherThing');
is( is(
$newFish->getProfileUrl('cellblock'), $newFish->getProfileUrl('cellblock'),
"cellblock?op=account;module=someOtherThing;do=view;uid=".$newFish->userId, "cellblock?op=account;module=someOtherThing;do=view;uid=".$newFish->userId,
'getProfileUrl: uses profileModuleIdentifier to pick the right Account module' '... uses profileModuleIdentifier to pick the right Account module'
); );
$session->config->set('profileModuleIdentifier', $profileModuleId); $session->config->set('profileModuleIdentifier', $profileModuleId);
@ -853,9 +854,20 @@ $session->asset(WebGUI::Asset->getDefault($session));
is( is(
$newFish->getProfileUrl(), $newFish->getProfileUrl(),
"/home?op=account;module=$profileModuleId;do=view;uid=".$newFish->userId, "/home?op=account;module=$profileModuleId;do=view;uid=".$newFish->userId,
'getProfileUrl: uses session->url->page if no URL is passed in' '... uses session->url->page if no URL is passed in'
); );
$session->setting->set('preventProxyCache', 1);
my $newFishId = $newFish->userId;
like(
$newFish->getProfileUrl(),
qr{/home\?noCache=\d+:\d+;op=account;module=$profileModuleId;do=view;uid=$newFishId},
'... handles preventProxyCache correctly'
);
$session->setting->set('preventProxyCache', 0);
################################################################ ################################################################
# #
# hasFriends # hasFriends