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

merge to 10219

Browse source
This commit is contained in:
Colin Kuskie 2009-04-08 16:35:31 +00:00
parent ae28bf79c8
commit 4c1307e3d0
194 changed files with 8203 additions and 2134 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Account/Contributions.pm
View file

@ -226,12 +226,6 @@ sub www_view {
$self->appendCommonVars($var);
$p->appendTemplateVars($var);
#Overwrite these
my $user = WebGUI::User->new($session,$userId);
$var->{'user_full_name' } = $user->getWholeName;
$var->{'user_member_since' } = $user->dateCreated;
return $self->processTemplate($var,$self->getViewTemplateId);
}

8
lib/WebGUI/Account/Friends.pm
View file

@ -232,7 +232,7 @@ sub getLayoutTemplateId {
#-------------------------------------------------------------------
=head2 getConfirmTemplateId ( )
=head2 getRemoveConfirmTemplateId ( )
This method returns the template ID for the confirmation screen.
@ -484,17 +484,13 @@ sub www_view {
my $var = {};
my $uid = $self->uid;
my $user = ($uid) ? WebGUI::User->new($session,$uid) : $session->user;
my $user = $self->getUser;
$self->appendCommonVars($var);
my $displayView = $uid ne "";
$var->{'display_message'} = $msg;
#Override these
$var->{'user_full_name' } = $user->getWholeName;
$var->{'user_member_since' } = $user->dateCreated;
unless ($user->profileField('ableToBeFriend') && $user->profileIsViewable($session->user)) {
my $i18n = WebGUI::International->new($session,"Account_Friends");
my $errorMsg = "";

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

@ -107,13 +107,13 @@ sub appendCommonVars {
my $self = shift;
my $var = shift;
my $session = $self->session;
my $user = $session->user;
my $user = $self->getUser;
my $pageUrl = $session->url->page;
$self->SUPER::appendCommonVars($var);
$var->{'edit_profile_url' } = $self->getUrl("module=profile;do=edit");
$var->{'invitations_enabled' } = $session->user->profileField('ableToBeFriend');
$var->{'invitations_enabled' } = $user->profileField('ableToBeFriend');
$var->{'profile_category_loop'} = [];
#Append the categories
@ -475,10 +475,6 @@ sub www_view {
$self->appendCommonVars($var);
#Overwrite these
$var->{'user_full_name' } = $user->getWholeName;
$var->{'user_member_since' } = $user->dateCreated;
$var->{'profile_user_id' } = $user->userId;
$var->{'can_edit_profile' } = $uid eq $session->user->userId;
#Check user privileges

6
lib/WebGUI/Account/_NewModule.skeleton
View file

@ -31,7 +31,7 @@ These methods are available from this class:
=head2 canView ( )
Returns whether or not the user can view the the tab for this module
Returns whether or not the user can view the the tab for this module
=cut
@ -44,7 +44,7 @@ sub canView {
=head2 editSettingsForm ( )
Creates form elements for user settings page custom to this account module
Creates form elements for user settings page custom to this account module
=cut
@ -83,7 +83,7 @@ sub editSettingsForm {
=head2 editSettingsFormSave ( )
Creates form elements for the settings page custom to this account module
Save form elements from the settings.
=cut