Change occurances of user->profileField to user->get
This commit is contained in:
parent
ae48e7517a
commit
59c03b50e7
41 changed files with 86 additions and 86 deletions
|
|
@ -741,7 +741,7 @@ sub view {
|
|||
$mailForm->email(
|
||||
-extras =>'class="content"',
|
||||
-name =>"from",
|
||||
-value =>$session->user->profileField("email"),
|
||||
-value =>$session->user->get("email"),
|
||||
-label =>$i18n->get('your email label'),
|
||||
);
|
||||
$mailForm->selectBox(
|
||||
|
|
@ -1020,7 +1020,7 @@ sub www_sendEmail {
|
|||
if ($form->process("body") ne "") {
|
||||
my $user = WebGUI::User->new($self->session, $self->get('maintainerId'));
|
||||
my $mail = WebGUI::Mail::Send->create($self->session,{
|
||||
to =>$user->profileField("email"),
|
||||
to =>$user->get("email"),
|
||||
subject =>$self->get('productName')." - ".$form->process("subject"),
|
||||
from=>$form->process("from")
|
||||
});
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ property username => (
|
|||
sub _username_builder {
|
||||
my $session = shift->session;
|
||||
return $session->form->process("visitorUsername")
|
||||
|| $session->user->profileField("alias")
|
||||
|| $session->user->get("alias")
|
||||
|| $session->user->username;
|
||||
}
|
||||
property rating => (
|
||||
|
|
@ -476,7 +476,7 @@ sub getAvatarUrl {
|
|||
return '' unless $parent and $parent->avatarsEnabled;
|
||||
my $user = WebGUI::User->new($self->session, $self->ownerUserId);
|
||||
#Get avatar field, storage Id.
|
||||
my $storageId = $user->profileField("avatar");
|
||||
my $storageId = $user->get("avatar");
|
||||
return '' unless $storageId;
|
||||
my $avatar = WebGUI::Storage->get($self->session,$storageId);
|
||||
my $avatarUrl = '';
|
||||
|
|
@ -963,7 +963,7 @@ sub notifySubscribers {
|
|||
my $companyAddress = $setting->get("companyEmail");
|
||||
my $listAddress = $cs->mailAddress;
|
||||
my $posterAddress = $user->getProfileFieldPrivacySetting('email') eq "all"
|
||||
? $user->profileField('email')
|
||||
? $user->get('email')
|
||||
: '';
|
||||
my $from = $posterAddress || $listAddress || $companyAddress;
|
||||
my $replyTo = $listAddress || $returnAddress || $companyAddress;
|
||||
|
|
@ -1079,7 +1079,7 @@ override processEditForm => sub {
|
|||
if ($form->process("assetId") eq "new") {
|
||||
my %data = (
|
||||
ownerUserId => $session->user->userId,
|
||||
username => $form->process("visitorName") || $session->user->profileField("alias") || $session->user->username,
|
||||
username => $form->process("visitorName") || $session->user->get("alias") || $session->user->username,
|
||||
);
|
||||
$self->update(\%data);
|
||||
}
|
||||
|
|
@ -1132,7 +1132,7 @@ sub postProcess {
|
|||
}
|
||||
my $i18n = WebGUI::International->new($self->session, "Asset_Post");
|
||||
if ($self->getThread->getParent->get("addEditStampToPosts")) {
|
||||
$data{content} .= "<p>\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->profileField("alias").") --- \n</p>";
|
||||
$data{content} .= "<p>\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->get("alias").") --- \n</p>";
|
||||
}
|
||||
$data{url} = $self->fixUrl($self->getThread->url."/1") if ($self->isReply && $self->isNew);
|
||||
$data{groupIdView} = $self->getThread->getParent->groupIdView;
|
||||
|
|
@ -1556,7 +1556,7 @@ sub www_edit {
|
|||
value => defined $subscribe ? $subscribe : 1,
|
||||
});
|
||||
}
|
||||
$content .= "\n\n".$user->profileField("signature") if ($user->profileField("signature") && !$form->process("content"));
|
||||
$content .= "\n\n".$user->get("signature") if ($user->get("signature") && !$form->process("content"));
|
||||
}
|
||||
else { # edit
|
||||
return $privilege->insufficient() unless ($self->canEdit);
|
||||
|
|
|
|||
|
|
@ -1086,7 +1086,7 @@ sub view {
|
|||
return $out if $out;
|
||||
}
|
||||
$self->session->scratch->set("discussionLayout",$self->session->form->process("layout")) if ($self->session->form->process("layout"));
|
||||
my $layout = $self->session->scratch->get("discussionLayout") || $self->session->user->profileField("discussionLayout");
|
||||
my $layout = $self->session->scratch->get("discussionLayout") || $self->session->user->get("discussionLayout");
|
||||
my $var = $self->getTemplateVars;
|
||||
$self->getParent->appendTemplateLabels($var);
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ sub addSessionVars {
|
|||
# These are the only session template variables used in the core as
|
||||
# of 6.8.5. Further use of session template vars is deprecated.
|
||||
$vars->{"session.user.username"} = $self->session->user->username;
|
||||
$vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek");
|
||||
$vars->{"session.user.firstDayOfWeek"} = $self->session->user->get("firstDayOfWeek");
|
||||
$vars->{"session.config.extrasurl"} = $self->session->url->extras();
|
||||
$vars->{"session.var.adminOn"} = $self->session->isAdminOn;
|
||||
$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ sub www_getHistory {
|
|||
.$icon->edit('func=edit;revision='.$revision->revisionDate, $revision->url)
|
||||
.$icon->view('func=view;revision='.$revision->revisionDate, $revision->url),
|
||||
date => $date->epochToHuman($revision->revisionDate),
|
||||
username => $user->profileField('alias') || $user->username,
|
||||
username => $user->get('alias') || $user->username,
|
||||
actionTaken => $revision->actionTaken,
|
||||
interval => join(" ", $date->secondsToInterval(time() - $revision->revisionDate))
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1200,7 +1200,7 @@ sub viewMonth {
|
|||
|
||||
#### Create the template parameters
|
||||
## The grid
|
||||
my $first_dow = $session->user->profileField("firstDayOfWeek") || 0;
|
||||
my $first_dow = $session->user->get("firstDayOfWeek") || 0;
|
||||
# 0 - sunday
|
||||
# 1 - mon
|
||||
# 2 - tue
|
||||
|
|
@ -1333,7 +1333,7 @@ sub viewWeek {
|
|||
$dt->truncate( to => "day");
|
||||
|
||||
# Apply First Day of Week settings
|
||||
my $first_dow = $session->user->profileField("firstDayOfWeek") || 0;
|
||||
my $first_dow = $session->user->get("firstDayOfWeek") || 0;
|
||||
# 0 - sunday
|
||||
# 1 - monday
|
||||
# 2 - tuesday, etc...
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ override getToolbar => sub {
|
|||
if ($self->getToolbarState) {
|
||||
my $toolbar = '';
|
||||
if ($self->canEditIfLocked) {
|
||||
my $userUiLevel = $self->session->user->profileField("uiLevel");
|
||||
my $userUiLevel = $self->session->user->get("uiLevel");
|
||||
my $uiLevels = $self->session->config->get("assetToolbarUiLevel");
|
||||
my $returnUrl = '';
|
||||
if ($self->session->asset) {
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ sub _htmlOfResourceList {
|
|||
$subvar->{resourceIcon} = 'groups.gif';
|
||||
} elsif ($resourceKind eq 'user') {
|
||||
my $user = WebGUI::User->new($self->session, $resourceId);
|
||||
my ($firstName, $lastName, $username) = ($user->profileField('firstName'), $user->profileField('lastName'), $user->username);
|
||||
my ($firstName, $lastName, $username) = ($user->get('firstName'), $user->get('lastName'), $user->username);
|
||||
my $displayName = do {
|
||||
if (length($firstName) && length($lastName)) { "$lastName, $firstName" }
|
||||
elsif (length($firstName)) { $firstName }
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ sub viewTemplateVariables {
|
|||
my $datePointer = undef;
|
||||
|
||||
my $icon = $session->icon;
|
||||
my $userUiLevel = $session->user->profileField("uiLevel");
|
||||
my $userUiLevel = $session->user->get("uiLevel");
|
||||
my $uiLevels = $session->config->get('assetToolbarUiLevel');
|
||||
|
||||
##Only build objects for the assets that we need
|
||||
|
|
|
|||
|
|
@ -174,7 +174,7 @@ sub viewTemplateVariables {
|
|||
$var->{story_loop} = [];
|
||||
|
||||
my $icon = $session->icon;
|
||||
my $userUiLevel = $session->user->profileField("uiLevel");
|
||||
my $userUiLevel = $session->user->get("uiLevel");
|
||||
my $uiLevels = $session->config->get('assetToolbarUiLevel');
|
||||
my $i18n = WebGUI::International->new($session);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue