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

some bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-10 04:02:10 +00:00
parent c61247768d
commit 12b4c40c92
7 changed files with 42 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -131,11 +131,11 @@ sub getIcon {
sub getLastPost {
my $self = shift;
my $lastPostId = $self->get("lastPostId");
my $lastPost = 0;
my $lastPost;
if ($lastPostId) {
$lastPost = WebGUI::Asset->new($lastPostId);
$lastPost = WebGUI::Asset::Post::Thread->new($lastPostId);
}
return $lastPost if ($lastPost);
return $lastPost if (defined $lastPost);
return $self;
}

33
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -62,7 +62,19 @@ sub appendPostListTemplateVars {
for (my $i=0;$i<=$post->get("rating");$i++) {
push(@rating_loop,{'rating_loop.count'=>$i});
}
my $lastPost = $post->WebGUI::Asset::Post::Thread::getLastPost();
my $lastPost = $post->getLastPost();
my %lastReply;
if ($self->get("displayLastReply")) {
%lastReply = (
"lastReply.url"=>$lastPost->getUrl(),
"lastReply.title"=>$lastPost->get("title"),
"lastReply.user.isVisitor"=>$lastPost->get("ownerUserId") eq "1",
"lastReply.username"=>$lastPost->get("username"),
"lastReply.userProfile.url"=>$lastPost->WebGUI::Asset::Post::getPosterProfileUrl(),
"lastReply.dateSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%Z")
);
}
push(@{$var->{post_loop}}, {
%{$post->get},
"id"=>$post->getId,
@ -78,13 +90,6 @@ sub appendPostListTemplateVars {
"timeUpdated.human"=>epochToHuman($post->get("dateUpdated"),"%Z"),
"userProfile.url"=>$post->getPosterProfileUrl,
"user.isVisitor"=>$post->get("ownerUserId") eq "1",
"lastReply.url"=>$lastPost->getUrl(),
"lastReply.title"=>$lastPost->get("title"),
"lastReply.user.isVisitor"=>$lastPost->get("ownerUserId") eq "1",
"lastReply.username"=>$lastPost->get("username"),
"lastReply.userProfile.url"=>$lastPost->WebGUI::Asset::Post::getPosterProfileUrl(),
"lastReply.dateSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%z"),
"lastReply.timeSubmitted.human"=>epochToHuman($lastPost->get("dateSubmitted"),"%Z"),
"edit.url"=>$post->getEditUrl,
'controls'=>$controls,
'inDateRange'=>$inDateRange,
@ -92,7 +97,8 @@ sub appendPostListTemplateVars {
"isThird"=>(($i+1)%3==0),
"isFourth"=>(($i+1)%4==0),
"isFifth"=>(($i+1)%5==0),
"user.isPoster"=>$post->isPoster
"user.isPoster"=>$post->isPoster,
%lastReply
});
$i++;
}
@ -247,6 +253,10 @@ sub definition {
tableName=>'Collaboration',
className=>'WebGUI::Asset::Wobject::Collaboration',
properties=>{
displayLastReply =>{
fieldType=>"yesNo",
defaultValue=>0
},
allowReplies =>{
fieldType=>"yesNo",
defaultValue=>1
@ -389,6 +399,11 @@ sub duplicate {
sub getEditForm {
my $self = shift;
my $tabform = $self->SUPER::getEditForm;
$tabform->getTab("display")->yesNo(
-value=>$self->getValue('displayLastReply'),
-label=>WebGUI::International::get('display last reply', 'Collaboration'),
-name=>"displayLastReply"
);
$tabform->getTab("display")->template(
-value=>$self->getValue('collaborationTemplateId'),
-namespace=>"Collaboration",

1
lib/WebGUI/Auth/WebGUI.pm
View file

@ -230,6 +230,7 @@ sub createAccountSave {
WebGUI::International::get('email address validation email subject','AuthWebGUI'),
WebGUI::International::get('email address validation email body','AuthWebGUI')."\n\n".WebGUI::URL::getSiteURL().WebGUI::URL::page("op=auth&method=validateEmail&key=".$key),
);
$self->SUPER::deactivateAccount("deactivateAccountConfirm");
$self->logout;
return $self->displayLogin(WebGUI::International::get('check email for validation','AuthWebGUI'));
}

2
lib/WebGUI/Form.pm
View file

@ -1562,7 +1562,7 @@ sub submit {
$value = _fixQuotes($value);
my $wait = WebGUI::International::get(452);
my $extras = $params->{extras} || 'onclick="this.value=\''.$wait.'\'"';
return '<input type="submit" value="'.$value.'" '.$params->{extras}.' />';
return '<input type="submit" value="'.$value.'" '.$extras.' />';
}

5
lib/WebGUI/i18n/English/Collaboration.pm
View file

@ -1,6 +1,11 @@
package WebGUI::i18n::English::Collaboration;
our $I18N = {
'display last reply' => {
message => q|Display last reply?|,
lastUpdated => 1109618544,
},
'preview' => {
message => q|Preview|,
lastUpdated => 1109618544,