diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index b30296be9..6d9d4472a 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -40,6 +40,11 @@ - bugfix [ 1150982 ] Subscribe to forum thread causes error - bugfix [ 1151216 ] The Latest News is blank on demo.plainblack.com - bugfix [ 1149458 ] CVS 6.3 -> ENV variables have changed for mod_perl 2.0 + - bugfix [ 1150729 ] Submission approval URL not working from email + - bugfix [ 1150078 ] userProfile.url not set in Thread::view() + - bugfix [ 1153919 ] Asset::fixUrl doesn't limit URL length + - bugfix [ 1152834 ] can not to add IndexedSearch + - bugfix [ 1150200 ] Add New DataForm crashes 6.3.0 diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index e95eac74a..b839faf9d 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -579,6 +579,9 @@ Any text string. Most likely will have been the Asset's name or title. sub fixUrl { my $self = shift; my $url = WebGUI::URL::urlize(shift); + if (length($url) > 250) { + $url = substr($url,220); + } $url .= ".".$session{setting}{urlExtension} if ($url =~ /\./ && $session{setting}{urlExtension} ne ""); my ($test) = WebGUI::SQL->quickArray("select url from asset where assetId<>".quote($self->getId)." and url=".quote($url)); if ($test) { diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 5958b1700..ce4a3fc72 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -108,7 +108,6 @@ sub definition { defaultValue=>time() }, username => { - noFormPost=>1, fieldType=>"hidden", defaultValue=>$session{user}{alias} || $session{user}{username} }, @@ -373,6 +372,7 @@ sub getTemplateVars { my %var = %{$self->get}; $var{"userId"} = $self->get("ownerUserId"); $var{"user.isPoster"} = $self->isPoster; + $var{"userProfile.url"} = $self->getUrl("op=viewProfile&uid=".$self->get("ownerUserId")); $var{"dateSubmitted.human"} = epochToHuman($self->get("dateSubmitted")); $var{"dateUpdated.human"} = epochToHuman($self->get("dateUpdated")); @@ -751,7 +751,7 @@ sub setStatusPending { my ($self) = @_; $self->update({status=>'pending'}); WebGUI::MessageLog::addInternationalizedEntry('',$self->getThread->getParent->get("moderateGroupId"), - $self->getUrl,578,'WebGUI','pending'); + $self->getUrl("func=view"),578,'WebGUI','pending'); } diff --git a/lib/WebGUI/Asset/Wobject/DataForm.pm b/lib/WebGUI/Asset/Wobject/DataForm.pm index 63e53c665..8546e923c 100644 --- a/lib/WebGUI/Asset/Wobject/DataForm.pm +++ b/lib/WebGUI/Asset/Wobject/DataForm.pm @@ -229,10 +229,10 @@ sub getEditForm { -value=>$self->getValue("mailData") ); if ($self->getId eq "new" && $session{form}{proceed} ne "manageAssets") { - $self->getTab("properties")->whatNext( + $tabform->getTab("properties")->whatNext( -options=>{ - addField=>WebGUI::International::get(76,"DataForm"), - backToPage=>WebGUI::International::get(745,"DataForm") + editField=>WebGUI::International::get(76,"DataForm"), + ""=>WebGUI::International::get(745,"DataForm") }, -value=>"editField" ); @@ -749,10 +749,10 @@ sub www_editField { if ($session{form}{fid} eq "new" && $session{form}{proceed} ne "manageAssets") { $f->whatNext( -options=>{ - addField=>WebGUI::International::get(76,"DataForm"), - backToPage=>WebGUI::International::get(745,"DataForm") + editField=>WebGUI::International::get(76,"DataForm"), + ""=>WebGUI::International::get(745,"DataForm") }, - -value=>"addField" + -value=>"editField" ); } $f->submit; @@ -790,10 +790,6 @@ sub www_editFieldSave { " where DataForm_fieldId=".quote($session{form}{fid})); } $self->reorderCollateral("DataForm_field","DataForm_fieldId", _tonull("DataForm_tabId",$session{form}{tid})) if ($session{form}{fid} ne "new"); - if ($session{form}{proceed} eq "addField") { - $session{form}{fid} = "new"; - return $self->www_editField(); - } return ""; } @@ -824,11 +820,11 @@ sub www_editTab { if ($session{form}{tid} eq "new") { $f->whatNext( -options=>{ - addTab=>WebGUI::International::get(103,"DataForm"), + editTab=>WebGUI::International::get(103,"DataForm"), - backToPage=>WebGUI::International::get(745,"DataForm") + ""=>WebGUI::International::get(745,"DataForm") }, - -value=>"addTab" + -value=>"editTab" ); } $f->submit; @@ -850,10 +846,6 @@ sub www_editTabSave { label=>$session{form}{label}, subtext=>$session{form}{subtext} }); - if ($session{form}{proceed} eq "addTab") { - $session{form}{tid} = "new"; - return $self->www_editTab(); - } return ""; } diff --git a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm index 1c8e78586..b3da396f9 100644 --- a/lib/WebGUI/Asset/Wobject/IndexedSearch.pm +++ b/lib/WebGUI/Asset/Wobject/IndexedSearch.pm @@ -29,14 +29,6 @@ sub definition { fieldType=>"template", defaultValue=>"PBtmpl0000000000000034" }, - linkURL=>{ - fieldType=>'url', - defaultValue=>undef - }, - linkTitle=>{ - fieldType=>'text', - defaultValue=>undef - }, indexName=>{ fieldType=>'text', defaultValue=>'default' diff --git a/lib/WebGUI/MessageLog.pm b/lib/WebGUI/MessageLog.pm index 37937f7b3..973c2677f 100644 --- a/lib/WebGUI/MessageLog.pm +++ b/lib/WebGUI/MessageLog.pm @@ -124,7 +124,7 @@ sub addEntry { unless ($url =~ /^http/ || !defined $url) { $url = WebGUI::URL::getSiteURL().$url; } - unless ($url =~ /op=/ || !defined $url) { + unless ($url =~ /func=/ || $url =~ /op=/ || !defined $url) { $url = WebGUI::URL::append($url, "op=viewMessageLogMessage"); } $status = $_[5]; @@ -192,7 +192,7 @@ sub addInternationalizedEntry { unless ($url =~ /^http/ || !defined $url) { $url = WebGUI::URL::getSiteURL().$url; } - unless ($url =~ /op=/ || !defined $url) { + unless ($url =~ /func=/ || $url =~ /op=/ || !defined $url) { $url = WebGUI::URL::append($url, "op=viewMessageLogMessage"); } $internationalId = $_[3]; diff --git a/lib/WebGUI/Operation/MessageLog.pm b/lib/WebGUI/Operation/MessageLog.pm index 0423202fe..3e255b52f 100644 --- a/lib/WebGUI/Operation/MessageLog.pm +++ b/lib/WebGUI/Operation/MessageLog.pm @@ -81,7 +81,7 @@ sub www_viewMessageLogMessage { my $status = _status->{$data->{status}}; if ($data->{url} ne "" && $data->{status} eq 'pending'){ $status = ''.$status.''; - $vars->{'message.takeAction'} = ''.WebGUI::International::get(554).'' + $vars->{'message.takeAction'} = ''.WebGUI::International::get(554).'' } $vars->{'message.status'} = $status;